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

Game Display: make first_turn a static local to the only function that uses it

Browse source
This commit is contained in:
Charles Dang 2021-01-14 10:42:03 +11:00
parent 2005cfd92e
commit cc7204f66e
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game_display.cpp
View file

@ -72,7 +72,6 @@ game_display::game_display(game_board& board,
, attack_indicator_dst_()
, route_()
, displayedUnitHex_()
, first_turn_(true)
, in_game_(false)
, chat_man_(new display_chat_manager(*this))
, mode_(RUNNING)
@ -91,9 +90,11 @@ game_display::~game_display()
void game_display::new_turn()
{
static bool first_turn = true;
const time_of_day& tod = resources::tod_manager->get_time_of_day();
if( !first_turn_) {
// We want to skip this on the first run of this function
if(!first_turn) {
const time_of_day& old_tod = resources::tod_manager->get_previous_time_of_day();
if(old_tod.image_mask != tod.image_mask) {
@ -131,7 +132,7 @@ void game_display::new_turn()
tod_hex_mask2 = nullptr;
}
first_turn_ = false;
first_turn = false;
display::update_tod();

2
src/game_display.hpp
View file

@ -232,7 +232,7 @@ private:
map_location displayedUnitHex_;
bool first_turn_, in_game_;
bool in_game_;
const std::unique_ptr<display_chat_manager> chat_man_;