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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/09/04 00:40:02

Modified files:
        src            : playlevel.cpp 

Log message:
        fixed bug where saving the game would cause units to refresh their 
movement points

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

Patches:
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.214 wesnoth/src/playlevel.cpp:1.215
--- wesnoth/src/playlevel.cpp:1.214     Sun Aug 28 10:32:18 2005
+++ wesnoth/src/playlevel.cpp   Sun Sep  4 00:40:02 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.214 2005/08/28 10:32:18 gruikya Exp $ */
+/* $Id: playlevel.cpp,v 1.215 2005/09/04 00:40:02 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -240,8 +240,9 @@
                }
 
                LOG_NG << "initializing team...\n";
-
-               if ((**ui)["controller"] == preferences::client_type() && 
(**ui)["description"] == preferences::login()) {
+
+               const std::string& controller = (**ui)["controller"];
+               if (controller == preferences::client_type() && 
(**ui)["description"] == preferences::login()) {
                        first_human_team = ui - unit_cfg.begin();
                } else if(first_human_team == -1 && ((**ui)["controller"] == 
"human" || (**ui)["persistent"] == "1")) {
                        first_human_team = ui - unit_cfg.begin();
@@ -345,7 +346,6 @@
                                        
player->available_units.push_back(new_unit);
                                }
                        } else {
-                               new_unit.new_turn();
                                
units.insert(std::pair<gamemap::location,unit>(loc,new_unit));
                                LOG_NG << "inserting unit for side " << 
new_unit.side() << "\n";
                        }