[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src multiplayer.hpp multiplayer.cpp
From: |
Jon Daniel |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src multiplayer.hpp multiplayer.cpp |
Date: |
Mon, 01 Aug 2005 19:45:10 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <address@hidden> 05/08/01 23:45:10
Modified files:
src : multiplayer.hpp multiplayer.cpp
Log message:
#13783 fixes.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.hpp.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.161&tr2=1.162&r1=text&r2=text
Patches:
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.161 wesnoth/src/multiplayer.cpp:1.162
--- wesnoth/src/multiplayer.cpp:1.161 Mon Aug 1 21:12:30 2005
+++ wesnoth/src/multiplayer.cpp Mon Aug 1 23:45:10 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.161 2005/08/01 21:12:30 j_daniel Exp $ */
+/* $Id: multiplayer.cpp,v 1.162 2005/08/01 23:45:10 j_daniel Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -345,19 +345,31 @@
case mp::ui::JOIN:
try {
enter_wait_mode(disp, game_config, data, chat,
gamelist, false);
- } catch(mp::error& err) {
- if(!err.message.empty()) {
- gui::show_error_message(disp,
err.message);
+ } catch(network::error& error) {
+ if(!error.message.empty()) {
+ if(error.message == _("No multiplayer
sides available in this game") ||
+ error.message == _("Era not
available") ||
+ error.message == _("No multiplayer
sides found")) {
+ gui::show_error_message(disp,
error.message);
+ break;
+ }
}
+ throw error;
}
break;
case mp::ui::OBSERVE:
try {
enter_wait_mode(disp, game_config, data, chat,
gamelist, true);
- } catch(mp::error& err) {
- if(!err.message.empty()) {
- gui::show_error_message(disp,
err.message);
+ } catch(network::error& error) {
+ if(!error.message.empty()) {
+ if(error.message == _("No multiplayer
sides available in this game") ||
+ error.message == _("Era not
available") ||
+ error.message == _("No multiplayer
sides found")) {
+ gui::show_error_message(disp,
error.message);
+ break;
+ }
}
+ throw error;
}
break;
case mp::ui::CREATE:
Index: wesnoth/src/multiplayer.hpp
diff -u wesnoth/src/multiplayer.hpp:1.30 wesnoth/src/multiplayer.hpp:1.31
--- wesnoth/src/multiplayer.hpp:1.30 Mon Aug 1 23:00:54 2005
+++ wesnoth/src/multiplayer.hpp Mon Aug 1 23:45:10 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.hpp,v 1.30 2005/08/01 23:00:54 j_daniel Exp $ */
+/* $Id: multiplayer.hpp,v 1.31 2005/08/01 23:45:10 j_daniel Exp $ */
/*
Copyright (C) 2005 Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -45,11 +45,6 @@
*/
void start_client(display& disp, const config& game_config, game_data& data,
const std::string host);
-
-struct error {
- error(const std::string& msg = "") : message(msg) { }
- std::string message;
-};
}
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src multiplayer.hpp multiplayer.cpp,
Jon Daniel <=