upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 12:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Made turn refresh (healing, poison, etc.) occur...

Browse Source 
...on first turn of game"

This reverts commit 2012-04-24T02:55:45Z!brilliand@gmail.com.
This commit is contained in:
Alexander van Gessel 2012-05-18 22:45:50 +01:00
parent bdbd6150c2
commit 4d0e232a03
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@ -75,9 +75,6 @@ Version 1.11.0-svn:
* Improved performance of the Editor Settings ToD lighting controls
* Engine:
* Fixed bug #19599: Engine keeps redundant unit.ai_special_ information.
* Unit refresh now occurs on first turn of the game (fixes bug #19656)
This includes healing, poison, movement and attack recovery, and
expiration of [object]duration=turn.
* Graphics:
* New graphics for the Spectre.
* Help menu:

18
src/play_controller.cpp
View File

@ -608,22 +608,17 @@ void play_controller::do_init_side(const unsigned int team_index, bool is_replay
if(current_team.is_human() && !is_replay) {
update_gui_to_player(player_number_ - 1);
}
// Calculate healing, poison, etc., unless we are loading a game.
if (!loading_game_) {
// 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 turn of processing,
// or if we are loading a game.
if (!loading_game_ && turn() > 1) {
for(unit_map::iterator i = units_.begin(); i != units_.end(); ++i) {
if (i->side() == player_number_) {
i->new_turn();
}
}
calculate_healing(player_number_, !skip_replay_);
reset_resting(units_, player_number_);
}
// Calculate the player's income, provided we are not loading
// a game and it is not the first turn of play.
if (!loading_game_ && turn() > 1) {
current_team.new_turn();
// If the expense is less than the number of villages owned
@ -634,6 +629,9 @@ void play_controller::do_init_side(const unsigned int team_index, bool is_replay
if(expense > 0) {
current_team.spend_gold(expense);
}
calculate_healing(player_number_, !skip_replay_);
reset_resting(units_, player_number_);
}
if (!loading_game_) {