libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 15:40:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TINSEL: Clear some more vars upon engine destruction

Browse Source
This commit is contained in:
Filippos Karapetis 2020-10-03 19:19:44 +03:00
parent e1d1d72db8
commit 672ab3cca3
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
engines/tinsel/tinsel.cpp
View File

@ -87,7 +87,7 @@ void SetNewScene(SCNHANDLE scene, int entrance, int transition);
//----------------- GLOBAL GLOBAL DATA --------------------
// FIXME: Avoid non-const global vars
// These vars are reset upon engine destruction
bool g_bRestart = false;
bool g_bHasRestarted = false;
@ -97,6 +97,9 @@ static bool g_bCuttingScene = false;
static bool g_bChangingForRestore = false;
// FIXME: CountOut is used by ChangeScene
static int CountOut = 1; // == 1 for immediate start of first scene
#ifdef DEBUG
bool g_bFast; // set to make it go ludicrously fast
#endif
@ -113,8 +116,8 @@ static Scene g_NextScene = { 0, 0, 0 };
static Scene g_HookScene = { 0, 0, 0 };
static Scene g_DelayedScene = { 0, 0, 0 };
static Common::PROCESS *g_pMouseProcess = 0;
static Common::PROCESS *g_pKeyboardProcess = 0;
static Common::PROCESS *g_pMouseProcess = nullptr;
static Common::PROCESS *g_pKeyboardProcess = nullptr;
static SCNHANDLE g_hCdChangeScene;
@ -633,10 +636,6 @@ void RestoreMasterProcess(INT_CONTEXT *pic) {
CoroScheduler.createProcess(PID_MASTER_SCR, RestoredProcess, &pic, sizeof(pic));
}
// FIXME: CountOut is used by ChangeScene
// FIXME: Avoid non-const global vars
static int CountOut = 1; // == 1 for immediate start of first scene
/**
* If a scene restore is going on, just return (we don't update the
* screen during this time).
@ -766,6 +765,27 @@ void LoadBasicChunks() {
}
}
void ResetVarsTinsel() {
g_bRestart = false;
g_bHasRestarted = false;
g_loadingFromGMM = false;
g_bCuttingScene = false;
g_bChangingForRestore = false;
CountOut = 1;
g_NextScene = {0, 0, 0};
g_HookScene = {0, 0, 0};
g_DelayedScene = {0, 0, 0};
g_pMouseProcess = nullptr;
g_pKeyboardProcess = nullptr;
g_hCdChangeScene = 0;
}
//----------------- TinselEngine --------------------
// Global pointer to engine
@ -904,7 +924,7 @@ TinselEngine::~TinselEngine() {
FreeAllTokens(); // token.cpp
RebootTimers(); // timers.cpp
ResetVarsTinlib(); // tinlib.cpp
// TODO: tinsel.cpp
ResetVarsTinsel(); // tinsel.cpp
}
Common::String TinselEngine::getSavegameFilename(int16 saveNum) const {