[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.15,1.16

David Eriksson twogood at users.sourceforge.net
Tue Oct 14 00:07:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv6138/queen

Modified Files:
	cutaway.cpp 
Log Message:
Using Walk::personMove now!


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cutaway.cpp	12 Oct 2003 19:16:48 -0000	1.15
+++ cutaway.cpp	14 Oct 2003 07:06:12 -0000	1.16
@@ -621,30 +621,30 @@
 
 	if (object.objectNumber == OBJECT_JOE) {
 		if (object.moveToX || object.moveToY) {
-			// XXX _walk->joeMove(0, object.moveToX, object.moveToY, true);
+			_walk->joeMove(0, object.moveToX, object.moveToY, true);
 		} 
 		strcpy(name, "JOE");
 	}
 	else {
-		// Not Joe XXX
-		warning("Person not Joe");
-		strcpy(name, "unknown");
-#if 0
-		K=OBJECT-ROOM_DATA[ROOM];
-
-		/* Find out which object position on the screen the person is */
+		Person p;
+		_logic->personSetData(
+				object.objectNumber - _logic->roomData(object.room), 
+				"", false, &p);
 
-		SET_PERSON_DATA(K,NULLstr,0);
-		if(OBJ_CUT[13]>0 || OBJ_CUT[14]>0)
-		{
-			bobs[P_BNUM].scale=SF;
-			bobs[P_BNUM].x=OBJ_CUT[13];
-			bobs[P_BNUM].y=OBJ_CUT[14];
+		strcpy(name, p.name);
+		if (object.moveToX || object.moveToY) {
+			BobSlot *bob = _graphics->bob(p.actor->bobNum);
+			// XXX bob->scale = SF;
+			bob->x = object.moveToX;
+			bob->y = object.moveToY;
 		}
-		/* Add person's direction to be passed across */
 
-		MOVE_OTHER(P_NAMEstr,IX,IY,CI+1,OBJECT_DATA[OBJECT][7]);
-#endif
+		_walk->personMove(
+				&p, 
+				object.moveToX, object.moveToY,
+				_logic->numFrames() + 1, 		// XXX CI+1
+				_logic->objectData(object.objectNumber)->image
+				);
 	}
 
 	if (_quit)
@@ -889,7 +889,7 @@
 	uint16 joeX    = READ_BE_UINT16(ptr); ptr += 2;
 	uint16 joeY    = READ_BE_UINT16(ptr); ptr += 2;
 
-	if ((!_quit || (!_anotherCutaway && joeRoom != _finalRoom)) &&
+	if ((!_quit || (!_anotherCutaway && joeRoom == _finalRoom)) &&
 			joeRoom != _temporaryRoom &&
 			joeRoom != 0) {
 





More information about the Scummvm-git-logs mailing list