renamed tod_manager::is_time_not_over() to tod_manager::is_turns_left

This commit is contained in:
Iurii Chernyi 2009-08-21 19:52:49 +00:00
parent 06017c6583
commit 4319830a5f
3 changed files with 4 additions and 4 deletions

View File

@ -841,7 +841,7 @@ void playsingle_controller::check_time_over(){
game_events::fire("time over"); game_events::fire("time over");
LOG_NG << "done firing time over event...\n"; LOG_NG << "done firing time over event...\n";
//if turns are added while handling 'time over' event //if turns are added while handling 'time over' event
if (tod_manager_.is_time_not_over()) { if (tod_manager_.is_turns_left()) {
return; return;
} }

View File

@ -319,11 +319,11 @@ bool tod_manager::next_turn()
{ {
next_time_of_day(); next_time_of_day();
++turn_; ++turn_;
return is_time_not_over(); return is_turns_left();
} }
bool tod_manager::is_time_not_over() bool tod_manager::is_turns_left()
{ {
return num_turns_ == -1 || turn_ <= size_t(num_turns_); return num_turns_ == -1 || turn_ <= size_t(num_turns_);
} }

View File

@ -111,7 +111,7 @@ class tod_manager : public savegame_config
* *
* @returns True if time has not expired. * @returns True if time has not expired.
*/ */
bool is_time_not_over(); bool is_turns_left();
private: private:
void set_start_ToD(config&, int current_turn); void set_start_ToD(config&, int current_turn);