[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.428,1.429 scumm.cpp,1.401,1.402

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28425/scumm

Modified Files:
	script_v6.cpp scumm.cpp 
Log Message:

Add correct fix for bug #556496


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -d -r1.428 -r1.429
--- script_v6.cpp	6 Apr 2005 00:51:03 -0000	1.428
+++ script_v6.cpp	6 Apr 2005 02:11:06 -0000	1.429
@@ -1340,6 +1340,7 @@
 		VAR(VAR_WALKTO_OBJ) = 0;
 
 	if (_version == 6) {
+		camera._cur.x = camera._dest.x = a->_pos.x;
 		setCameraFollows(a);
 	}
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -d -r1.401 -r1.402
--- scumm.cpp	5 Apr 2005 11:06:00 -0000	1.401
+++ scumm.cpp	6 Apr 2005 02:11:07 -0000	1.402
@@ -2255,6 +2255,10 @@
 		a->putActor(x, y, _currentRoom);
 		a->setDirection(dir + 180);
 		a->stopActorMoving();
+		if (_gameId == GID_SAMNMAX) {
+			camera._cur.x = camera._dest.x = a->_pos.x;
+			setCameraAt(a->_pos.x, a->_pos.y);
+		}
 	}
 
 	showActors();