[Wesnoth-cvs-commits] wesnoth/src playturn.cpp actions.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/04/21 12:28:14

Modified files:
        src            : playturn.cpp actions.cpp 

Log message:
        fixed bug where units could be invisible when first recruited (CVS 
internal)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.360&tr2=1.361&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.206&tr2=1.207&r1=text&r2=text

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.206 wesnoth/src/actions.cpp:1.207
--- wesnoth/src/actions.cpp:1.206       Wed Apr 20 23:45:00 2005
+++ wesnoth/src/actions.cpp     Thu Apr 21 12:28:14 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.206 2005/04/20 23:45:00 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.207 2005/04/21 12:28:14 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1726,7 +1726,11 @@
                
unit_display::move_unit(*disp,map,steps,u,status.get_time_of_day(),units,teams);
        }
 
-       u.set_movement(moves_left);
+       u.set_movement(moves_left);
+
+       if(disp != NULL) {
+               disp->hide_unit(gamemap::location());
+       }
 
        units.erase(ui);
        ui = 
units.insert(std::pair<gamemap::location,unit>(steps.back(),u)).first;
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.360 wesnoth/src/playturn.cpp:1.361
--- wesnoth/src/playturn.cpp:1.360      Wed Apr 20 23:45:00 2005
+++ wesnoth/src/playturn.cpp    Thu Apr 21 12:28:14 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.360 2005/04/20 23:45:00 Sirp Exp $ */
+/* $Id: playturn.cpp,v 1.361 2005/04/21 12:28:14 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1385,7 +1385,8 @@
                un.set_goto(gamemap::location());
                
                gui_.hide_unit(u->first,true);
-               
unit_display::move_unit(gui_,map_,route,un,status_.get_time_of_day(),units_,teams_);
+               
unit_display::move_unit(gui_,map_,route,un,status_.get_time_of_day(),units_,teams_);
+               gui_.hide_unit(gamemap::location());
 
                units_.erase(u);
                un.set_movement(starting_moves);
@@ -1467,6 +1468,7 @@
                
                gui_.hide_unit(u->first,true);
                
unit_display::move_unit(gui_,map_,route,un,status_.get_time_of_day(),units_,teams_);
+               gui_.hide_unit(gamemap::location());
 
                units_.erase(u);
                un.set_movement(starting_moves);