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

remove unused play_controller::start_turn_ variable

Browse source
This commit is contained in:
gfgtdf 2015-09-06 22:57:04 +02:00
parent 12e839b9b7
commit 4103ae29f5
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/play_controller.cpp
View file

@ -136,7 +136,6 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
, replay_(new replay(state_of_game.get_replay()))
, loading_game_(!level["playing_team"].empty())
, player_number_(level["playing_team"].to_int() + 1)
, start_turn_(gamestate_.tod_manager_.turn()) // gamestate_.tod_manager_ constructed above
, skip_replay_(skip_replay)
, linger_(false)
, it_is_a_new_turn_(level["it_is_a_new_turn"].to_bool(true))
@ -305,8 +304,7 @@ void play_controller::fire_prestart()
gamestate_.gamedata_.set_phase(game_data::PRESTART);
pump().fire("prestart");
// prestart event may modify start turn with WML, reflect any changes.
start_turn_ = turn();
gamestate_.gamedata_.get_variable("turn_number") = int(start_turn_);
gamestate_.gamedata_.get_variable("turn_number") = int(turn());
}
void play_controller::fire_start()
@ -314,8 +312,7 @@ void play_controller::fire_start()
gamestate_.gamedata_.set_phase(game_data::START);
pump().fire("start");
// start event may modify start turn with WML, reflect any changes.
start_turn_ = turn();
gamestate_.gamedata_.get_variable("turn_number") = int(start_turn_);
gamestate_.gamedata_.get_variable("turn_number") = int(turn());
check_objectives();
// prestart and start events may modify the initial gold amount,
// reflect any changes.

1
src/play_controller.hpp
View file

@ -280,7 +280,6 @@ protected:
bool loading_game_;
int player_number_;
unsigned int start_turn_;
bool skip_replay_;
bool linger_;
bool it_is_a_new_turn_;