[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.68,1.69

[Gregory Montoir]

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

Modified Files:
	cutaway.cpp 
Log Message:
Apparently, my previous fix (joe position when switching room) causes trouble when returning from a cutaway with initialRoom != currentRoom. I added a condition, but that's not exactly like the original. Maybe one effect of the missing SETUP_ROOM call in cutaway code.

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- cutaway.cpp	16 Nov 2003 19:55:02 -0000	1.68
+++ cutaway.cpp	16 Nov 2003 20:31:14 -0000	1.69
@@ -1337,8 +1337,9 @@
 			restorePersonData();
 
 			debug(0, "_logic->entryObj() = %i", _logic->entryObj());
-			if (_logic->entryObj() > 0)
+			if (_logic->entryObj() > 0) {
 				_initialRoom = _logic->objectData(_logic->entryObj())->room;
+			}
 			else {
 				// We're not returning to new room, so return to old Joe X,Y coords
 				debug(0, "[Cutaway::run] Moving joe to (%i, %i)", initialJoeX, initialJoeY);
@@ -1354,8 +1355,10 @@
 				_logic->newRoom(_initialRoom);
 				_logic->display()->fullscreen(true);
 			}
-			_logic->joeX(0);
-			_logic->joeY(0);
+			else {
+				_logic->joeX(0);
+				_logic->joeY(0);
+			}
 		}
 
 		// XXX CUTJOEF=0;