libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-15 06:18:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Fix memory leak when quitting in showTitleScreen()

Browse Source
This commit is contained in:
Strangerke 2014-03-05 08:16:49 +01:00
parent afb785e5c1
commit bc8486a76b
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
engines/voyeur/voyeur.cpp
View File

@ -381,41 +381,46 @@ bool VoyeurEngine::doLock() {
}
void VoyeurEngine::showTitleScreen() {
if (_bVoy->getBoltGroup(0x500)) {
_graphicsManager->_backgroundPage = _bVoy->getPictureResource(0x500);
if (!_bVoy->getBoltGroup(0x500))
return;
(*_graphicsManager->_vPort)->setupViewPort();
flipPageAndWait();
_graphicsManager->_backgroundPage = _bVoy->getPictureResource(0x500);
// Immediate palette load to show the initial screen
CMapResource *cMap = _bVoy->getCMapResource(0x501);
assert(cMap);
cMap->_steps = 60;
cMap->startFade();
(*_graphicsManager->_vPort)->setupViewPort();
flipPageAndWait();
// Wait briefly
_eventsManager->delayClick(200);
if (shouldQuit())
return;
// Fade out the screen
cMap = _bVoy->getCMapResource(0x504);
cMap->_steps = 30;
cMap->startFade();
flipPageAndWaitForFade();
if (shouldQuit())
return;
_graphicsManager->screenReset();
_eventsManager->delayClick(200);
// Voyeur title
playRL2Video("a1100100.rl2");
_graphicsManager->screenReset();
// Immediate palette load to show the initial screen
CMapResource *cMap = _bVoy->getCMapResource(0x501);
assert(cMap);
cMap->_steps = 60;
cMap->startFade();
// Wait briefly
_eventsManager->delayClick(200);
if (shouldQuit()) {
_bVoy->freeBoltGroup(0x500);
return;
}
// Fade out the screen
cMap = _bVoy->getCMapResource(0x504);
cMap->_steps = 30;
cMap->startFade();
flipPageAndWaitForFade();
if (shouldQuit()) {
_bVoy->freeBoltGroup(0x500);
return;
}
_graphicsManager->screenReset();
_eventsManager->delayClick(200);
// Voyeur title
playRL2Video("a1100100.rl2");
_graphicsManager->screenReset();
_bVoy->freeBoltGroup(0x500);
}
void VoyeurEngine::doOpening() {