Author: jhinrichs
Date: Thu Apr 2 01:49:26 2009
New Revision: 34384
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34384&view=rev
Log:
Fix engine problem (loading a savegame from turn 1 will give all subsequent
teams income where it should not do so).
Modified:
trunk/src/play_controller.cpp
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=34384&r1=34383&r2=34384&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Thu Apr 2 01:49:26 2009
@@ -438,7 +438,9 @@
// Healing/income happen if it's not the first turn of processing,
// or if we are loading a game, and this is not the player it started
with.
// FIXME: This does not work correct if loading a save of turn 1
(turn_refresh should be false but is true for every subsequent side)
- const bool turn_refresh = status_.turn() > start_turn_ ||
(loading_game_ && team_index != (first_player_ - 1));
+ const bool turn_refresh = ( (status_.turn() > start_turn_) ||
(loading_game_ && team_index != (first_player_ - 1)) )
+ && (start_turn_
> 1);
+
if(turn_refresh) {
for(unit_map::iterator i = units_.begin(); i != units_.end();
++i) {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
