CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <[EMAIL PROTECTED]> 05/01/21 02:14:55
Modified files:
src : playlevel.cpp
Log message:
Fixed bug #11359 causing side turn events to be fired even when the
turn was not refreshed.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.166&tr2=1.167&r1=text&r2=text
Patches:
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.166 wesnoth/src/playlevel.cpp:1.167
--- wesnoth/src/playlevel.cpp:1.166 Sat Jan 1 22:54:59 2005
+++ wesnoth/src/playlevel.cpp Fri Jan 21 02:14:55 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.166 2005/01/01 22:54:59 Sirp Exp $ */
+/* $Id: playlevel.cpp,v 1.167 2005/01/21 02:14:55 j_daniel Exp $ */
/*
Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -508,7 +508,6 @@
std::stringstream player_number_str;
player_number_str << player_number;
game_events::set_variable("side_number",player_number_str.str());
- game_events::fire("side turn");
//we want to work out if units for this player
should get healed, and the
//player should get income now. healing/income
happen if it's not the first
@@ -517,6 +516,7 @@
const bool turn_refresh = !first_time ||
loading_game && team_it != teams.begin()+first_player;
if(turn_refresh) {
+ game_events::fire("side turn");
for(unit_map::iterator i =
units.begin(); i != units.end(); ++i) {
if(i->second.side() ==
player_number) {
i->second.new_turn();
