aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2003-01-08 23:41:27 +0000
committerMax Horn2003-01-08 23:41:27 +0000
commit531e73418f6122be327123f168b837ad7eddddab (patch)
treef04ecd2373838791d60baf462472b9591378ec35 /scumm/scumm.h
parentecb9c2dd74f28a38203df5b57101cbfd6b69851c (diff)
downloadscummvm-rg350-531e73418f6122be327123f168b837ad7eddddab.tar.gz
scummvm-rg350-531e73418f6122be327123f168b837ad7eddddab.tar.bz2
scummvm-rg350-531e73418f6122be327123f168b837ad7eddddab.zip
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
svn-id: r6363
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index edd0c67d77..1e5a45669a 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -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);