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

Close sky.dnr directly after reading it into memory. No need to keep it open

Browse Source 
until the Disk object is deleted.

svn-id: r25889
This commit is contained in:
Torbjörn Andersson 2007-02-26 23:08:52 +00:00
parent 41574458fc
commit 2c7bf36af8
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/sky/disk.cpp
View File

@ -37,17 +37,17 @@ static const char *dinnerFilename = "sky.dnr";
Disk::Disk() {
_dataDiskHandle = new Common::File();
_dnrHandle = new Common::File();
Common::File *dnrHandle = new Common::File();
_dnrHandle->open(dinnerFilename);
if (!_dnrHandle->isOpen())
dnrHandle->open(dinnerFilename);
if (!dnrHandle->isOpen())
error("Could not open %s", dinnerFilename);
if (!(_dinnerTableEntries = _dnrHandle->readUint32LE()))
if (!(_dinnerTableEntries = dnrHandle->readUint32LE()))
error("Error reading from sky.dnr"); //even though it was opened correctly?!
_dinnerTableArea = (uint8 *)malloc(_dinnerTableEntries * 8);
uint32 entriesRead = _dnrHandle->read(_dinnerTableArea, 8 * _dinnerTableEntries) / 8;
uint32 entriesRead = dnrHandle->read(_dinnerTableArea, 8 * _dinnerTableEntries) / 8;
if (entriesRead != _dinnerTableEntries)
error("entriesRead != dinnerTableEntries. [%d/%d]", entriesRead, _dinnerTableEntries);
@ -60,16 +60,16 @@ Disk::Disk() {
memset(_buildList, 0, 60 * 2);
memset(_loadedFilesList, 0, 60 * 4);
dnrHandle->close();
delete dnrHandle;
}
Disk::~Disk(void) {
if (_dnrHandle->isOpen())
_dnrHandle->close();
if (_dataDiskHandle->isOpen())
_dataDiskHandle->close();
fnFlushBuffers();
free(_dinnerTableArea);
delete _dnrHandle;
delete _dataDiskHandle;
}

1
engines/sky/disk.h
View File

@ -64,7 +64,6 @@ protected:
uint32 _dinnerTableEntries;
uint8 *_dinnerTableArea;
Common::File *_dataDiskHandle;
Common::File *_dnrHandle;
RncDecoder _rncDecoder;
uint16 _buildList[MAX_FILES_IN_LIST];