diff options
| author | Travis Howell | 2004-09-27 10:25:45 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-27 10:25:45 +0000 |
| commit | d066b12eae2bd20e08a47059304e16ea58ccf658 (patch) | |
| tree | 9054f58f36e4d96e59626abd70a17b5898ca3a9c /scumm | |
| parent | 993ac60b9b7743f626edeca9146705ec2c75f7ec (diff) | |
| download | scummvm-rg350-d066b12eae2bd20e08a47059304e16ea58ccf658.tar.gz scummvm-rg350-d066b12eae2bd20e08a47059304e16ea58ccf658.tar.bz2 scummvm-rg350-d066b12eae2bd20e08a47059304e16ea58ccf658.zip | |
Correction for roomImages
RMSC is room scripts.
svn-id: r15307
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/resource.cpp | 6 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index d954f61d28..e022af1af2 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -591,7 +591,7 @@ void ScummEngine::readIndexFile() { break; case MKID('DIRI'): - readResTypeList(rtRoom, MKID('RMIM'), "room image"); + readResTypeList(rtRoomImage, MKID('RMIM'), "room image"); break; case MKID('ANAM'): @@ -606,7 +606,7 @@ void ScummEngine::readIndexFile() { readResTypeList(rtRoom, MKID('ROOM'), "room"); break; - case MKID('DRSC'): // FIXME: Verify + case MKID('DRSC'): readResTypeList(rtRoomScripts, MKID('RMSC'), "room script"); break; @@ -2454,6 +2454,7 @@ void ScummEngine::allocateArrays() { allocResTypeData(rtCostume, (_features & GF_NEW_COSTUMES) ? MKID('AKOS') : MKID('COST'), _numCostumes, "costume", 1); allocResTypeData(rtRoom, MKID('ROOM'), _numRooms, "room", 1); + allocResTypeData(rtRoomImage, MKID('RMIM'), _numRooms, "room image", 1); allocResTypeData(rtRoomScripts, MKID('RMSC'), _numRooms, "room script", 1); allocResTypeData(rtSound, MKID('SOUN'), _numSounds, "sound", 2); allocResTypeData(rtScript, MKID('SCRP'), _numScripts, "script", 1); @@ -2468,7 +2469,6 @@ void ScummEngine::allocateArrays() { allocResTypeData(rtFlObject, MKID('NONE'), _numFlObject, "flobject", 0); allocResTypeData(rtMatrix, MKID('NONE'), 10, "boxes", 0); allocResTypeData(rtImage, MKID('AWIZ'), _numImages, "images", 1); - allocResTypeData(rtRoomImage, MKID('RMIM'), _numRooms, "room image", 1); allocResTypeData(rtTalkie, MKID('TLKE'), _numTalkies, "talkie", 1); } diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index bfb4182b0d..cb955497d5 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1905,7 +1905,7 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { void ScummEngine::initRoomSubBlocks() { int i; const byte *ptr; - byte *roomptr, *searchptr, *roomResPtr, *roomStartPtr = 0; + byte *roomptr, *searchptr, *roomResPtr, *roomImagePtr = 0; const RoomHeader *rmhd; _ENCD_offs = 0; @@ -1927,7 +1927,7 @@ void ScummEngine::initRoomSubBlocks() { // Determine the room and room script base address roomResPtr = roomptr = getResourceAddress(rtRoom, _roomResource); if (_heversion >= 70) - roomStartPtr = getResourceAddress(rtRoomImage, _roomResource); + roomImagePtr = getResourceAddress(rtRoomImage, _roomResource); else if (_version == 8) roomResPtr = getResourceAddress(rtRoomScripts, _roomResource); if (!roomptr || !roomResPtr) @@ -1982,7 +1982,7 @@ void ScummEngine::initRoomSubBlocks() { } else if (_features & GF_SMALL_HEADER) { _IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr; } else if (_heversion >= 70) { - _IM00_offs = findResource(MKID('IM00'), roomStartPtr) - roomStartPtr; + _IM00_offs = findResource(MKID('IM00'), roomImagePtr) - roomImagePtr; } else { _IM00_offs = findResource(MKID('IM00'), findResource(MKID('RMIM'), roomptr)) - roomptr; } |