[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.67,1.68 logic.cpp,1.101,1.102

Gregory Montoir cyx at users.sourceforge.net
Sun Nov 16 11:57:31 CET 2003


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

Modified Files:
	cutaway.cpp logic.cpp 
Log Message:
fix 'wrong Joe position when switching from hotel basement to lobby' issue

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- cutaway.cpp	15 Nov 2003 21:33:04 -0000	1.67
+++ cutaway.cpp	16 Nov 2003 19:55:02 -0000	1.68
@@ -1354,6 +1354,8 @@
 				_logic->newRoom(_initialRoom);
 				_logic->display()->fullscreen(true);
 			}
+			_logic->joeX(0);
+			_logic->joeY(0);
 		}
 
 		// XXX CUTJOEF=0;

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- logic.cpp	16 Nov 2003 10:47:31 -0000	1.101
+++ logic.cpp	16 Nov 2003 19:55:04 -0000	1.102
@@ -1595,6 +1595,8 @@
 ObjectData *Logic::joeSetupInRoom(bool autoPosition, uint16 scale) {
 	// queen.c SETUP_HERO()
 
+	debug(0, "Logic::joeSetupInRoom(%d, %d) joe.x=%d joe.y=%d", autoPosition, scale, _joe.x, _joe.y);
+
 	uint16 oldx;
 	uint16 oldy;
 	WalkOffData *pwo = NULL;
@@ -1603,9 +1605,9 @@
 		error("Logic::joeSetupInRoom() - No object data for obj %d", _entryObj);
 	}
 
-	if (!autoPosition || _joe.x != 0 || _joe.y != 0) {
-		oldx = _joe.x;
-		oldy = _joe.y;
+	if (!autoPosition || joeX() != 0 || joeY() != 0) {
+		oldx = joeX();
+		oldy = joeY();
 	}
 	else {
 		// find the walk off point for the entry object and make 
@@ -1661,8 +1663,8 @@
 	pbs->x = oldx;
 	pbs->y = oldy;
 	pbs->frameNum = 29 + FRAMES_JOE_XTRA;
-	_joe.x = 0;
-	_joe.y = 0;
+	joeX(0);
+	joeY(0);
 
 	if (pwo != NULL) {
 		// entryObj has a walk off point, then walk from there to object x,y





More information about the Scummvm-git-logs mailing list