libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Fix opening empty resources from the DAT file

Browse Source
This commit is contained in:
Paul Gilbert 2016-08-20 21:53:10 -04:00
parent ca07e26f9e
commit bad8605014
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/titanic/support/files_manager.cpp
View File

@ -21,6 +21,7 @@
*/
#include "common/file.h"
#include "common/memstream.h"
#include "titanic/support/files_manager.h"
#include "titanic/game_manager.h"
@ -51,7 +52,7 @@ void CFilesManager::loadResourceIndex() {
for (;;) {
offset = _datFile.readUint32LE();
size = _datFile.readUint32LE();
if (size == 0)
if (offset == 0 && size == 0)
break;
Common::String resName;
@ -126,7 +127,8 @@ Common::SeekableReadStream *CFilesManager::getResource(const CString &str) {
ResourceEntry resEntry = _resources[str];
_datFile.seek(resEntry._offset);
return _datFile.readStream(resEntry._size);
return (resEntry._size > 0) ? _datFile.readStream(resEntry._size) :
new Common::MemoryReadStream(nullptr, 0);
}
} // End of namespace Titanic