[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.81,1.82
Max Horn
fingolfin at users.sourceforge.net
Mon Apr 28 05:39:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15353
Modified Files:
object.cpp
Log Message:
cleanup (yes, the parentstate was changed from 1 to 16 for V3/V4 games - but that actually seems to be correct, according to older comments in this file, and the disassmbly)
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- object.cpp 26 Apr 2003 16:56:59 -0000 1.81
+++ object.cpp 28 Apr 2003 12:38:24 -0000 1.82
@@ -633,6 +633,8 @@
od->x_pos = *(ptr + 9) << 3;
od->y_pos = ((*(ptr + 10)) & 0x7F) << 3;
+ od->parentstate = (*(ptr + 10) & 0x80) ? 16 : 0;
+
od->width = *(ptr + 11) << 3;
od->parent = *(ptr + 12);
@@ -642,18 +644,13 @@
od->walk_y = *(ptr + 14);
od->actordir = (*(ptr + 15)) & 7;
od->height = *(ptr + 15) & 0xf8;
- od->parentstate = (*(ptr + 10) & 0x80) >> 4;
} else {
od->walk_x = READ_LE_UINT16(ptr + 13);
od->walk_y = READ_LE_UINT16(ptr + 15);
od->actordir = (*(ptr + 17)) & 7;
od->height = *(ptr + 17) & 0xf8;
- if (*(ptr + 10) & 0x80) {
- od->parentstate = 1;
- } else {
- od->parentstate = 0;
- }
}
+
return;
}
More information about the Scummvm-git-logs
mailing list