[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.76,1.77 scummvm.cpp,2.97,2.98
Pawel Kolodziejski
aquadran at users.sourceforge.net
Mon Apr 21 06:12:01 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13042
Modified Files:
object.cpp scummvm.cpp
Log Message:
fixes for v3 broken by v2
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- object.cpp 21 Apr 2003 11:19:55 -0000 1.76
+++ object.cpp 21 Apr 2003 13:10:57 -0000 1.77
@@ -637,7 +637,7 @@
od->parent = *(ptr + 12);
- if (_features & GF_AFTER_V3) {
+ if (_features & GF_AFTER_V2) {
od->walk_x = *(ptr + 13);
od->walk_y = *(ptr + 14);
od->actordir = (*(ptr + 15)) & 7;
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.97
retrieving revision 2.98
diff -u -d -r2.97 -r2.98
--- scummvm.cpp 21 Apr 2003 11:19:56 -0000 2.97
+++ scummvm.cpp 21 Apr 2003 13:10:58 -0000 2.98
@@ -905,7 +905,7 @@
//
// Find the room image data
//
- if (_features & GF_AFTER_V2)
+ if (_features & GF_OLD_BUNDLE)
_IM00_offs = READ_LE_UINT16(roomptr + 0x0A);
else if (_features & GF_SMALL_HEADER)
_IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr;
@@ -928,7 +928,7 @@
//
if (_features & GF_AFTER_V2)
_EXCD_offs = READ_LE_UINT16(roomptr + 0x18);
- else if (_features & GF_OLD_BUNDLE)
+ else if (_features & GF_AFTER_V3)
_EXCD_offs = READ_LE_UINT16(roomptr + 0x19);
else {
ptr = findResourceData(MKID('EXCD'), roomResPtr);
@@ -943,7 +943,7 @@
//
if (_features & GF_AFTER_V2)
_ENCD_offs = READ_LE_UINT16(roomptr + 0x1C);
- else if (_features & GF_OLD_BUNDLE)
+ else if (_features & GF_AFTER_V3)
_ENCD_offs = READ_LE_UINT16(roomptr + 0x1B);
else {
ptr = findResourceData(MKID('ENCD'), roomResPtr);
@@ -959,14 +959,14 @@
if (_features & GF_SMALL_HEADER) {
if (_features & GF_AFTER_V2)
ptr = roomptr + *(roomptr + 0x15);
- else if (_features & GF_OLD_BUNDLE)
+ else if (_features & GF_AFTER_V3)
ptr = roomptr + READ_LE_UINT16(roomptr + 0x15);
else
ptr = findResourceData(MKID('BOXD'), roomptr);
if (ptr) {
byte numOfBoxes = *ptr;
int size;
- if (_features & GF_AFTER_V3) // GF_OLD256 or GF_AFTER_V3 ?
+ if (_features & GF_OLD_BUNDLE)
size = numOfBoxes * (SIZEOF_BOX - 2) + 1;
else
size = numOfBoxes * SIZEOF_BOX + 1;
@@ -976,7 +976,7 @@
ptr += size;
if (_features & GF_AFTER_V2)
size = (READ_LE_UINT16(roomptr + 0x0A) - *(roomptr + 0x15)) - size;
- else if (_features & GF_OLD_BUNDLE)
+ else if (_features & GF_AFTER_V3)
// FIXME. This is an evil HACK!!!
size = (READ_LE_UINT16(roomptr + 0x0A) - READ_LE_UINT16(roomptr + 0x15)) - size;
else
@@ -1064,7 +1064,7 @@
loadResource(rtScript, *ptr++);
}
- if (!(_features & GF_AFTER_V2)) {
+ if (_features & GF_AFTER_V3) {
num_sounds = *(roomResPtr + 23);
num_scripts = *(roomResPtr + 24);
ptr = roomptr + 29 + num_objects * 4 + num_sounds + num_scripts;
More information about the Scummvm-git-logs
mailing list