ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid memory access when closing window during cutscene

Browse Source
This commit is contained in:
Benau 2021-07-19 13:02:49 +08:00
parent ced813a483
commit 840a023aa6
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modes/cutscene_world.cpp
View File

@ -66,6 +66,7 @@ CutsceneWorld::CutsceneWorld() : World()
m_play_ready_set_go_sounds = false;
m_fade_duration = 1.0f;
m_camera = NULL;
m_cleared_cutscene = false;
} // CutsceneWorld
//-----------------------------------------------------------------------------
@ -177,6 +178,7 @@ void CutsceneWorld::init()
CutsceneWorld::~CutsceneWorld()
{
main_loop->setAllowLargeDt(false);
clearCutscene();
} // ~CutsceneWorld
//-----------------------------------------------------------------------------
void CutsceneWorld::reset(bool restart)
@ -402,13 +404,23 @@ void CutsceneWorld::update(int ticks)
//-----------------------------------------------------------------------------
void CutsceneWorld::enterRaceOverState()
void CutsceneWorld::clearCutscene()
{
if (m_cleared_cutscene)
return;
GUIEngine::CutsceneScreen* cs = dynamic_cast<GUIEngine::CutsceneScreen*>(
GUIEngine::getCurrentScreen());
if (cs != NULL)
cs->onCutsceneEnd();
m_cleared_cutscene = true;
}
//-----------------------------------------------------------------------------
void CutsceneWorld::enterRaceOverState()
{
clearCutscene();
int partId = -1;
for (int i=0; i<(int)m_parts.size(); i++)
@ -594,7 +606,7 @@ void CutsceneWorld::enterRaceOverState()
RaceManager::get()->startSingleRace(next_part, 999, RaceManager::get()->raceWasStartedFromOverworld());
// Keep showing cutscene gui if previous scene was using it
CutSceneGeneral* csg = dynamic_cast<CutSceneGeneral*>(cs);
CutSceneGeneral* csg = dynamic_cast<CutSceneGeneral*>(GUIEngine::getCurrentScreen());
if (csg != NULL)
{
CutSceneGeneral* scene = CutSceneGeneral::getInstance();

2
src/modes/cutscene_world.hpp
View File

@ -44,6 +44,7 @@ class CutsceneWorld : public World
double m_duration;
bool m_aborted;
bool m_cleared_cutscene;
float m_fade_duration;
@ -58,6 +59,7 @@ class CutsceneWorld : public World
std::vector<std::string> m_parts;
void clearCutscene();
public:
CutsceneWorld();