diff options
| author | Travis Howell | 2006-03-02 05:04:40 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-03-02 05:04:40 +0000 |
| commit | 2c9f04117899098ef1347421bbe937d7ac486b49 (patch) | |
| tree | 31899ea516c651175d0cb1a68572679d10afa812 /engines/scumm/object.cpp | |
| parent | 2584f0d69f664d67cdf53bfcfe460765d5710435 (diff) | |
| download | scummvm-rg350-2c9f04117899098ef1347421bbe937d7ac486b49.tar.gz scummvm-rg350-2c9f04117899098ef1347421bbe937d7ac486b49.tar.bz2 scummvm-rg350-2c9f04117899098ef1347421bbe937d7ac486b49.zip | |
Fix inventory display in C64 maniac
svn-id: r21003
Diffstat (limited to 'engines/scumm/object.cpp')
| -rw-r--r-- | engines/scumm/object.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 478bbbc2af..23fad05174 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -987,7 +987,7 @@ const byte *ScummEngine::getObjOrActorName(int obj) { byte *objptr; int i; - if (obj < _numActors) + if (obj < _numActors && !(_game.platform == Common::kPlatformC64 && _game.id == GID_MANIAC)) return derefActor(obj, "getObjOrActorName")->getActorName(); for (i = 0; i < _numNewNames; i++) { @@ -1004,7 +1004,9 @@ const byte *ScummEngine::getObjOrActorName(int obj) { if (_game.features & GF_SMALL_HEADER) { byte offset = 0; - if (_game.version <= 2) + if (_game.platform == Common::kPlatformC64 && _game.id == GID_MANIAC) + offset = *(objptr + 13); + else if (_game.version <= 2) offset = *(objptr + 14); else if (_game.features & GF_OLD_BUNDLE) offset = *(objptr + 16); |