diff options
| author | Paweł Kołodziejski | 2003-04-26 16:56:59 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-04-26 16:56:59 +0000 |
| commit | 64e5240efdc937174259827bbd8c287a6bc43510 (patch) | |
| tree | b092ba04e6b06df37bb3a453fbefdd9476f7e952 /scumm | |
| parent | 7a5438a59269eb9224e1b0745bfda9d4f18925d3 (diff) | |
| download | scummvm-rg350-64e5240efdc937174259827bbd8c287a6bc43510.tar.gz scummvm-rg350-64e5240efdc937174259827bbd8c287a6bc43510.tar.bz2 scummvm-rg350-64e5240efdc937174259827bbd8c287a6bc43510.zip | |
fixed offsets for object names for scumm v2
svn-id: r7142
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/object.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 52b10b8add..eb0c19ad2f 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -836,7 +836,9 @@ byte *Scumm::getObjOrActorName(int obj) { objptr = getOBCDFromObject(obj); if (objptr) { - if (_features & GF_OLD_BUNDLE) + if (_features & GF_AFTER_V2) + offset = *(objptr + 14); + else if (_features & GF_OLD_BUNDLE) offset = *(objptr + 16); else offset = READ_LE_UINT16(objptr + 18); diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 33df291f4d..f9813101fc 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -1312,7 +1312,7 @@ void Scumm_v2::o2_setObjectName() { byte offset = 0; objptr = getOBCDFromObject(obj); - offset = *(objptr + 18); + offset = *(objptr + 14); size = READ_LE_UINT16(objptr) - offset; if (i >= size) { |