[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.56,2.57

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21362

Modified Files:
	script_v2.cpp 
Log Message:
cleaned up / fixed some V2 state stuff

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.56
retrieving revision 2.57
diff -u -d -r2.56 -r2.57
--- script_v2.cpp	9 May 2003 05:55:11 -0000	2.56
+++ script_v2.cpp	10 May 2003 21:35:06 -0000	2.57
@@ -433,7 +433,7 @@
 
 void Scumm_v2::o2_clearState08() {
 	int obj = getVarOrDirectWord(0x80);
-	putState(obj, getState(obj) & 0xF7);
+	putState(obj, getState(obj) & ~0x08);
 	removeObjectFromRoom(obj);
 	clearDrawObjectQueue();
 }
@@ -678,10 +678,10 @@
 	h = od->height;
 
 	i = _numLocalObjects;
-	do {
+	while (i--) {
 		if (_objs[i].obj_nr && _objs[i].x_pos == x && _objs[i].y_pos == y && _objs[i].width == w && _objs[i].height == h)
-			putState(_objs[i].obj_nr, getState(_objs[i].obj_nr) & 0xF7);
-	} while (--i);
+			putState(_objs[i].obj_nr, getState(_objs[i].obj_nr) & ~0x08);
+	}
 
 	putState(obj, getState(_objs[obj].obj_nr) | 0x08);
 }
@@ -1083,8 +1083,7 @@
 	addObjectToInventory(obj, _roomResource);
 	removeObjectFromRoom(obj);
 	putOwner(obj, VAR(VAR_EGO));
-	putClass(obj, 32, 1);
-	putState(obj, 1);
+	putState(obj, getState(obj) | 0xA);
 	clearDrawObjectQueue();
 	runHook(1);
 }