libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 01:46:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TINSEL: Change cdGraphStream to a Common::File pointer,

Browse Source 
to not rely on global constructors

svn-id: r48765
This commit is contained in:
Max Horn 2010-04-21 21:23:08 +00:00
parent 37b7be4519
commit f103f01284
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/tinsel/handle.cpp
View File

@ -80,7 +80,7 @@ static uint32 cdPlayHandle = (uint32)-1;
static int cdPlayFileNum, cdPlaySceneNum;
static SCNHANDLE cdBaseHandle = 0, cdTopHandle = 0;
static Common::File cdGraphStream;
static Common::File *cdGraphStream = 0;
static char szCdPlayFile[100];
@ -179,20 +179,23 @@ void FreeHandleTable() {
free(handleTable);
handleTable = NULL;
}
if (cdGraphStream.isOpen())
cdGraphStream.close();
if (cdGraphStream) {
delete cdGraphStream;
cdGraphStream = 0;
}
}
/**
* Loads a memory block as a file.
*/
void OpenCDGraphFile() {
if (cdGraphStream.isOpen())
cdGraphStream.close();
if (cdGraphStream)
delete cdGraphStream;
// As the theory goes, the right CD will be in there!
if (!cdGraphStream.open(szCdPlayFile))
cdGraphStream = new Common::File;
if (!cdGraphStream->open(szCdPlayFile))
error(CANNOT_FIND_FILE, szCdPlayFile);
}
@ -214,14 +217,15 @@ void LoadCDGraphData(MEMHANDLE *pH) {
assert(addr);
// Move to correct place in file and load the required data
cdGraphStream.seek(cdBaseHandle & OFFSETMASK, SEEK_SET);
bytes = cdGraphStream.read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
assert(cdGraphStream);
cdGraphStream->seek(cdBaseHandle & OFFSETMASK, SEEK_SET);
bytes = cdGraphStream->read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
// New code to try and handle CD read failures 24/2/97
while (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES) {
// Try again
cdGraphStream.seek(cdBaseHandle & OFFSETMASK, SEEK_SET);
bytes = cdGraphStream.read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
cdGraphStream->seek(cdBaseHandle & OFFSETMASK, SEEK_SET);
bytes = cdGraphStream->read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
}
// discardable - unlock the memory