[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.274,1.275 scumm.cpp,1.232,1.233
Travis Howell
kirben at users.sourceforge.net
Mon Sep 27 03:35:42 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17678/scumm
Modified Files:
resource.cpp scumm.cpp
Log Message:
Correction for roomImages
RMSC is room scripts.
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- resource.cpp 19 Sep 2004 00:15:08 -0000 1.274
+++ resource.cpp 27 Sep 2004 10:25:45 -0000 1.275
@@ -591,7 +591,7 @@
break;
case MKID('DIRI'):
- readResTypeList(rtRoom, MKID('RMIM'), "room image");
+ readResTypeList(rtRoomImage, MKID('RMIM'), "room image");
break;
case MKID('ANAM'):
@@ -606,7 +606,7 @@
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 @@
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 @@
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);
}
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- scumm.cpp 26 Sep 2004 15:29:57 -0000 1.232
+++ scumm.cpp 27 Sep 2004 10:25:45 -0000 1.233
@@ -1905,7 +1905,7 @@
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 @@
// 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 @@
} 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;
}
More information about the Scummvm-git-logs
mailing list