4c59dfb6
Race fix to follow
@ -1279,11 +1279,6 @@ void DoPaletteAnimations()
}
void GameLoopPaletteAnimations()
{
if (!_pause_mode && HasBit(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations();
/**
* Determine a contrasty text colour for a coloured background.
* @param background Background colour.
@ -44,7 +44,6 @@
#include "string_type.h"
void GameLoop();
void GameLoopPaletteAnimations();
void CreateConsole();
@ -94,6 +94,7 @@
void CallLandscapeTick();
void IncreaseDate();
void DoPaletteAnimations();
void MusicLoop();
void ResetMusic();
void CallWindowGameTickEvent();
@ -1970,6 +1971,8 @@ void GameLoop()
StateGameLoop();
SoundDriver::GetInstance()->MainLoop();
MusicLoop();
@ -51,14 +51,12 @@ void VideoDriver_Null::MainLoop()
if (this->until_exit) {
while (!_exit_game) {
::GameLoop();
::GameLoopPaletteAnimations();
::InputLoop();
::UpdateWindows();
} else {
for (int i = 0; i < this->ticks; i++) {
@ -34,10 +34,6 @@ void VideoDriver::GameLoop()
std::lock_guard<std::mutex> lock(this->game_state_mutex);
// TODO: lock
// TODO: unlock