0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert back to hardcoded start turn 1...

Browse source 
...since on reload we have no idea what the real start turn is..
This commit is contained in:
Gunter Labes 2009-10-02 02:48:23 +00:00
parent 6e3ac07df8
commit 3bc3d62ba0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/play_controller.cpp
View file

@ -449,7 +449,7 @@ void play_controller::init_side(const unsigned int team_index, bool is_replay){
&& !current_team.get_disallow_observers()) {
gui_->set_team(size_t(team_index));
}
gui_->set_playing_team(size_t(team_index));
gui_->set_playing_team(size_t(team_index));
std::stringstream player_number_str;
player_number_str << player_number_;
@ -494,7 +494,7 @@ void play_controller::do_init_side(const unsigned int team_index){
// 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() > start_turn_) {
if (!loading_game_ && turn() > 1) {
for(unit_map::iterator i = units_.begin(); i != units_.end(); ++i) {
if (i->second.side() == player_number_) {
i->second.new_turn();