[Scummvm-cvs-logs] CVS: scummvm/queen walk.cpp,1.10,1.11 cutaway.cpp,1.20,1.21

[Gregory Montoir]

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

Modified Files:
	walk.cpp cutaway.cpp 
Log Message:
fix personMove / cutaway problem

Index: walk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/walk.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- walk.cpp	14 Oct 2003 19:06:44 -0000	1.10
+++ walk.cpp	15 Oct 2003 08:46:04 -0000	1.11
@@ -26,6 +26,7 @@
 
 namespace Queen {
 
+
 const MovePersonData Walk::_moveData[] = {
    {"COMPY",       -1, -6, 1, 6, 0, 0, 0, 0,12,12,1,14},
    {"DEINO",       -1, -8, 1, 8, 0, 0, 0, 0,11,11,1,10},
@@ -299,8 +300,6 @@
 }
 
 
-
-
 void Walk::joeMove(int direction, uint16 endx, uint16 endy, bool inCutaway) {
 
 //   CAN=0
@@ -341,9 +340,13 @@
 }
 
 
-
 void Walk::personMove(const Person *pp, uint16 endx, uint16 endy, uint16 curImage, int direction) {
 
+	if (endx == 0 && endy == 0) {
+		warning("Walk::personMove() - endx == 0 && endy == 0");
+		return;
+	}
+
 	// TODO: room 69 specific
 
 	// CAN = 0;
@@ -571,7 +574,6 @@
 			}
 		}		
 	}
-	// CAN = -1 if no connection is made, else 0
 	return _areaList[1] != 0;
 }
 
@@ -600,7 +602,6 @@
 //		pwd->sign = ((pwd->dx < 0) ? -1 : ((pwd->dx > 0) ? 1 : 0)) ;
 	}
 }
-
 
 
 } // End of namespace Queen

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cutaway.cpp	14 Oct 2003 19:06:44 -0000	1.20
+++ cutaway.cpp	15 Oct 2003 08:46:04 -0000	1.21
@@ -640,21 +640,21 @@
 		_logic->personSetData(
 				object.objectNumber - _logic->roomData(object.room), 
 				"", true, &p);
-
+#if 0
 		debug(0, "Moving person '%s' (%i) = actor '%s' to (%i,%i)", 
 				_logic->objectName(object.objectNumber),
 				object.objectNumber,
 				p.name, object.moveToX, object.moveToY);
-
+#endif
 		strcpy(name, p.name);
-		if (object.moveToX || object.moveToY) {
+		if (object.bobStartX || object.bobStartY) {
 			BobSlot *bob = _graphics->bob(p.actor->bobNum);
 			bob->scale = 100; // XXX SF;
-			bob->x = object.moveToX;
-			bob->y = object.moveToY;
+			bob->x = object.bobStartX;
+			bob->y = object.bobStartY;
 		}
 
-#if 0
+#if 1
 		_walk->personMove(
 				&p, 
 				object.moveToX, object.moveToY,