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

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

Browse source 
This reverts commit cc7204f66e.
This commit is contained in:
Gunter Labes 2023-07-26 19:00:45 +02:00
parent 7f8ce9982f
commit 9ad7a3e821
No known key found for this signature in database
GPG key ID: C0C7B971CC910216
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game_display.cpp
View file

@ -73,6 +73,7 @@ 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,11 +92,9 @@ 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();
// We want to skip this on the first run of this function
if(!first_turn) {
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) {
@ -133,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

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