Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	README.md
#	premake5.lua
#	src/render/Particle.cpp
This commit is contained in:
Sergeanur 2021-06-26 14:27:54 +03:00
commit d4ba7c387b
8 changed files with 16123 additions and 31 deletions

View file

@ -2919,9 +2919,15 @@ CMenuManager::InitialiseChangedLanguageSettings()
{
if (m_bFrontEnd_ReloadObrTxtGxt) {
m_bFrontEnd_ReloadObrTxtGxt = false;
#ifdef FIX_BUGS
if (gGameState > GS_INIT_ONCE)
#endif
CTimer::Stop();
TheText.Unload();
TheText.Load();
#ifdef FIX_BUGS
if (gGameState > GS_INIT_ONCE)
#endif
CTimer::Update();
CGame::frenchGame = false;
CGame::germanGame = false;