thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correction for roomImages

Browse source 
RMSC is room scripts.

svn-id: r15307
This commit is contained in:
Travis Howell 2004-09-27 10:25:45 +00:00
parent 993ac60b9b
commit d066b12eae
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/scumm.cpp
View file

@ -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;
}