Revert: 4c59dfb6, move DoPaletteAnimations back into GameLoop

Race fix to follow

src/gfx.cpp

@@ -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.

src/gfx_func.h

@@ -44,7 +44,6 @@
 #include "string_type.h"
 
 void GameLoop();
-void GameLoopPaletteAnimations();
 
 void CreateConsole();
 

src/openttd.cpp

@@ -94,6 +94,7 @@
 
 void CallLandscapeTick();
 void IncreaseDate();
+void DoPaletteAnimations();
 void MusicLoop();
 void ResetMusic();
 void CallWindowGameTickEvent();
@@ -1970,6 +1971,8 @@ void GameLoop()
 		StateGameLoop();
 	}
 
+	if (!_pause_mode && HasBit(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations();
+
 	SoundDriver::GetInstance()->MainLoop();
 	MusicLoop();
 }

src/video/null_v.cpp

@@ -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++) {
 			::GameLoop();
-			::GameLoopPaletteAnimations();
 			::InputLoop();
 			::UpdateWindows();
 		}

src/video/video_driver.cpp

@@ -34,10 +34,6 @@ void VideoDriver::GameLoop()
 		std::lock_guard<std::mutex> lock(this->game_state_mutex);
 
 		::GameLoop();
-
-		// TODO: lock
-		::GameLoopPaletteAnimations();
-		// TODO: unlock
 	}
 }