[Wesnoth-cvs-commits] wesnoth/src multiplayer.hpp multiplayer.cpp mul...

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/08/01 21:12:30

Modified files:
        src            : multiplayer.hpp multiplayer.cpp 
                         multiplayer_wait.cpp 

Log message:
        Fixed bug #13783 which caused players not to be able to stay in lobby 
after an non critical error.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.hpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.160&tr2=1.161&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_wait.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.160 wesnoth/src/multiplayer.cpp:1.161
--- wesnoth/src/multiplayer.cpp:1.160   Sat Jun  4 19:16:05 2005
+++ wesnoth/src/multiplayer.cpp Mon Aug  1 21:12:30 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.160 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: multiplayer.cpp,v 1.161 2005/08/01 21:12:30 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -343,10 +343,22 @@
 
                switch (res) {
                case mp::ui::JOIN:
-                       enter_wait_mode(disp, game_config, data, chat, 
gamelist, false);
+                       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);
+                               }
+                       }
                        break;
                case mp::ui::OBSERVE:
-                       enter_wait_mode(disp, game_config, data, chat, 
gamelist, true);
+                       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);
+                               }
+                       }
                        break;
                case mp::ui::CREATE:
                        try {
Index: wesnoth/src/multiplayer.hpp
diff -u wesnoth/src/multiplayer.hpp:1.28 wesnoth/src/multiplayer.hpp:1.29
--- wesnoth/src/multiplayer.hpp:1.28    Sat Jun  4 19:16:05 2005
+++ wesnoth/src/multiplayer.hpp Mon Aug  1 21:12:30 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.hpp,v 1.28 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: multiplayer.hpp,v 1.29 2005/08/01 21:12:30 j_daniel Exp $ */
 /*
    Copyright (C) 2005 Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -46,6 +46,10 @@
 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
Index: wesnoth/src/multiplayer_wait.cpp
diff -u wesnoth/src/multiplayer_wait.cpp:1.28 
wesnoth/src/multiplayer_wait.cpp:1.29
--- wesnoth/src/multiplayer_wait.cpp:1.28       Mon Jun  6 20:12:47 2005
+++ wesnoth/src/multiplayer_wait.cpp    Mon Aug  1 21:12:30 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_wait.cpp,v 1.28 2005/06/06 20:12:47 gruikya Exp $ */
+/* $Id: multiplayer_wait.cpp,v 1.29 2005/08/01 21:12:30 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -16,6 +16,7 @@
 #include "display.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
+#include "multiplayer.hpp"
 #include "multiplayer_wait.hpp"
 #include "preferences.hpp"
 #include "statistics.hpp"
@@ -177,7 +178,7 @@
 
                if(sides_list.empty()) {
                        set_result(QUIT);
-                       throw network::error(_("No multiplayer sides available 
in this game"));
+                       throw mp::error(_("No multiplayer sides available in 
this game"));
                        return;
                }
 
@@ -204,12 +205,12 @@
                if(allow_changes) {
                        const config* era = level_.child("era");
                        if(era == NULL)
-                               throw network::error(_("Era not available"));
+                               throw mp::error(_("Era not available"));
                        const config::child_list& possible_sides =
                                era->get_children("multiplayer_side");
                        if(possible_sides.empty()) {
                                set_result(QUIT);
-                               throw network::error(_("No multiplayer sides 
found"));
+                               throw mp::error(_("No multiplayer sides 
found"));
                                return;
                        }