[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.107,2.108
Max Horn
fingolfin at users.sourceforge.net
Thu May 22 06:58:05 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.106,2.107
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.92,2.93 saveload.cpp,1.74,1.75 script.cpp,1.99,1.100 script_v2.cpp,2.108,2.109 script_v5.cpp,1.94,1.95 scumm.h,1.208,1.209 vars.cpp,1.54,1.55
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7463
Modified Files:
script_v2.cpp
Log Message:
fixed o2_ifClassOfIs
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.107
retrieving revision 2.108
diff -u -d -r2.107 -r2.108
--- script_v2.cpp 22 May 2003 13:18:54 -0000 2.107
+++ script_v2.cpp 22 May 2003 13:57:34 -0000 2.108
@@ -946,16 +946,16 @@
}
void Scumm_v2::o2_ifClassOfIs() {
- int act = getVarOrDirectWord(0x80);
+ int obj = getVarOrDirectWord(0x80);
int clsop = getVarOrDirectByte(0x40);
- if (getObjectIndex(act) == -1) {
+ if (getObjectIndex(obj) == -1) {
o5_jumpRelative();
return;
}
- ObjectData *od = &_objs[getObjectIndex(act)];
- byte cls = *(getResourceAddress(rtRoom, _currentRoom) + od->OBCDoffset + 10);
+ byte *obcd = getOBCDFromObject(obj);
+ byte cls = *(obcd + 6);
if ((cls & clsop) != clsop) {
o5_jumpRelative();
return;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.106,2.107
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.92,2.93 saveload.cpp,1.74,1.75 script.cpp,1.99,1.100 script_v2.cpp,2.108,2.109 script_v5.cpp,1.94,1.95 scumm.h,1.208,1.209 vars.cpp,1.54,1.55
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list