libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-30 14:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

our File class already makes sure we find stuff in the resource subdirectory. Plus, it handles different cases right. So now COMI works from CD on Mac OS X, too

Browse Source 
svn-id: r6363
This commit is contained in:
Max Horn 2003-01-08 23:41:27 +00:00
parent ecb9c2dd74
commit 531e73418f
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scumm/resource.cpp
View File

@ -195,7 +195,7 @@ bool Scumm::openResourceFile(const char *filename)
}
strcpy(buf, filename);
_fileHandle.open(buf, getResDataPath(), 1, _encbyte);
_fileHandle.open(buf, getGameDataPath(), 1, _encbyte);
return _fileHandle.isOpen();
}
@ -207,7 +207,7 @@ void Scumm::askForDisk(const char *filename, int disknum)
if (_features & GF_AFTER_V8) {
char result;
sprintf(buf, "Cannot find file: '%s'\nInsert disk %d into drive %s\nHit Ok to retry, Cancel to exit", filename, disknum, getResDataPath());
sprintf(buf, "Cannot find file: '%s'\nInsert disk %d into drive %s\nHit Ok to retry, Cancel to exit", filename, disknum, getGameDataPath());
result = displayError(true, buf);
if (result == 2)

13
scumm/scumm.h
View File

@ -291,18 +291,7 @@ public:
bool _insaneState;
bool _videoFinished;
const char *getResDataPath() const { return _gameDataPath; }
const char *getGameDataPath() const {
if (_features & GF_AFTER_V8) {
static char resourcePath[256];
if (_gameDataPath[0] == '\0')
return "resource";
sprintf(resourcePath, "%sresource", _gameDataPath);
return resourcePath;
}
return _gameDataPath;
}
const char *getGameDataPath() const { return _gameDataPath; }
void pauseGame(bool user);
void shutDown(int i);