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

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/10/03 19:29:54

Modified files:
        src            : multiplayer_connect.cpp 

Log message:
        Fixed recruit lists being those of a random faction when loading saves 
of multiplayer games. (needs confirmation to see if it actually works)

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

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.75 
wesnoth/src/multiplayer_connect.cpp:1.76
--- wesnoth/src/multiplayer_connect.cpp:1.75    Sun Oct  3 18:00:15 2004
+++ wesnoth/src/multiplayer_connect.cpp Sun Oct  3 19:29:54 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.75 2004/10/03 18:00:15 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.76 2004/10/03 19:29:54 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -152,7 +152,6 @@
        if(scenario_data["era"].empty()) {
                era_ = era;
        } else { 
-               std::cerr << "Era set to " << scenario_data["era"] << "!";
                era_ = scenario_data["era"];
        }
 
@@ -229,8 +228,10 @@
                if(side["leader"].empty())
                        side["leader"] = (*possible_sides.front())["leader"];
 
-               if(side["type"].empty() && save_ == false)
+               if(side["type"].empty() && save_ == false) {
+                       side["random_faction"] = 
(*possible_sides.front())["random_faction"];
                        side["type"] = (*possible_sides.front())["type"];
+               }
 
                if(side["recruit"].empty())
                        side["recruit"] = (*possible_sides.front())["recruit"];
@@ -238,9 +239,6 @@
                if(side["music"].empty())
                        side["music"] = (*possible_sides.front())["music"];
 
-               if(side["random_faction"].empty())
-                       side["random_faction"] = 
(*possible_sides.front())["random_faction"];
-
                if(side["terrain_liked"].empty())
                        side["terrain_liked"] = 
(*possible_sides.front())["terrain_liked"];