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

TINSEL: Fix bug #3306020, DW2: Crash On Entering Sewers

Browse Source 
This is the cowardly fix that reintroduces one of the variables
that was removed by a cleanup on April 10.
This commit is contained in:
eriktorbjorn 2011-05-23 23:19:44 +02:00
parent 5838ef6719
commit 793849c974
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/tinsel/handle.cpp
View File

@ -79,6 +79,7 @@ static uint numHandles = 0;
static uint32 cdPlayHandle = (uint32)-1;
static int cdPlaySceneNum;
static SCNHANDLE cdBaseHandle = 0, cdTopHandle = 0;
static Common::File *cdGraphStream = 0;
@ -246,7 +247,9 @@ void LoadCDGraphData(MEMHANDLE *pH) {
* @param next Handle of end of range + 1
*/
void LoadExtraGraphData(SCNHANDLE start, SCNHANDLE next) {
if (start == cdBaseHandle)
// It's not clear that this can ever be true. See bug #3306020, DW2:
// Crash On Entering Sewers, for some background information.
if (cdPlaySceneNum == 0 && start == cdBaseHandle)
return;
OpenCDGraphFile();
@ -262,6 +265,7 @@ void LoadExtraGraphData(SCNHANDLE start, SCNHANDLE next) {
}
void SetCdPlaySceneDetails(int fileNum, const char *fileName) {
cdPlaySceneNum = fileNum;
strcpy(szCdPlayFile, fileName);
}