diff options
Diffstat (limited to 'engines/tinsel/handle.cpp')
| -rw-r--r-- | engines/tinsel/handle.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index a48fd2ca1f..6f5f92c969 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -27,6 +27,7 @@ #define BODGE #include "common/file.h" +#include "common/textconsole.h" #include "tinsel/drives.h" #include "tinsel/dw.h" @@ -65,8 +66,6 @@ enum { fLoaded = 0x20000000L ///< set when file data has been loaded }; #define FSIZE_MASK 0x00FFFFFFL ///< mask to isolate the filesize -#define MALLOC_MASK 0xFF000000L ///< mask to isolate the memory allocation flags -//#define HANDLEMASK 0xFF800000L ///< get handle of address //----------------- LOCAL GLOBAL DATA -------------------- @@ -80,7 +79,6 @@ static uint numHandles = 0; static uint32 cdPlayHandle = (uint32)-1; -static int cdPlayFileNum, cdPlaySceneNum; static SCNHANDLE cdBaseHandle = 0, cdTopHandle = 0; static Common::File *cdGraphStream = 0; @@ -235,7 +233,7 @@ void LoadCDGraphData(MEMHANDLE *pH) { // clear the loading flag // pH->filesize &= ~fLoading; - if (bytes != ((cdTopHandle-cdBaseHandle) & OFFSETMASK)) + if (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK)) // file is corrupt error(FILE_READ_ERROR, "CD play file"); } @@ -248,7 +246,7 @@ void LoadCDGraphData(MEMHANDLE *pH) { * @param next Handle of end of range + 1 */ void LoadExtraGraphData(SCNHANDLE start, SCNHANDLE next) { - if (cdPlayFileNum == cdPlaySceneNum && start == cdBaseHandle) + if (start == cdBaseHandle) return; OpenCDGraphFile(); @@ -264,7 +262,6 @@ void LoadExtraGraphData(SCNHANDLE start, SCNHANDLE next) { } void SetCdPlaySceneDetails(int fileNum, const char *fileName) { - cdPlaySceneNum = fileNum; strcpy(szCdPlayFile, fileName); } |