[Wesnoth-cvs-commits] wesnoth/src multiplayer_connect.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/11/13 21:48:48

Modified files:
        src            : multiplayer_connect.cpp 

Log message:
        fixed bug where loading a saved multiplayer game could cause an 
assertion failure

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.88&tr2=1.89&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.88 
wesnoth/src/multiplayer_connect.cpp:1.89
--- wesnoth/src/multiplayer_connect.cpp:1.88    Wed Nov 10 03:10:34 2004
+++ wesnoth/src/multiplayer_connect.cpp Sat Nov 13 21:48:46 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.88 2004/11/10 03:10:34 Sirp Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.89 2004/11/13 21:48:46 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -661,7 +661,7 @@
                }
 
                        
-               if (combos_race_[n].changed()) {
+               if (!save_ && combos_race_[n].changed()) {
                        const string_map& values =  
possible_sides[combos_race_[n].selected()]->values;
                        side["random_faction"] = "";
                        for(string_map::const_iterator i = values.begin(); i != 
values.end(); ++i) {
@@ -670,13 +670,11 @@
                        }
                        level_changed = true;
 
-                       assert(!save_);
-                               
player_leaders_[n].update_leader_list(combos_race_[n].selected());
+                       
player_leaders_[n].update_leader_list(combos_race_[n].selected());
                }
 
                //Player leader
-               if (combos_leader_[n].changed()) {
-                       assert(!save_);
+               if (!save_ && combos_leader_[n].changed()) {
                        std::stringstream str;
                        str << (combos_team_[n].selected()+1);
                        side["type"] = player_leaders_[n].get_leader();