[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.55,2.56

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15851/scumm

Modified Files:
	script_v2.cpp 
Log Message:
Fix intro room transition. Seems correct, so the fixme is really just explanitory.


Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.55
retrieving revision 2.56
diff -u -d -r2.55 -r2.56
--- script_v2.cpp	9 May 2003 01:01:53 -0000	2.55
+++ script_v2.cpp	9 May 2003 05:55:11 -0000	2.56
@@ -394,7 +394,7 @@
 	}
 	*ptr = 0;
 
-	printf("TODO: Scumm_v2::decodeParseString(\"%s\")\n", buffer);
+	printf("TODO: Scumm_v2::decodeParseString(\"%s\") from %d\n", buffer, vm.slot[_currentScript].number);
 }
 
 int Scumm_v2::readVar(uint var) {
@@ -874,7 +874,8 @@
 }
 
 void Scumm_v2::o2_panCameraTo() {
-	panCameraTo(getVarOrDirectByte(0x80), 0);
+	panCameraTo(getVarOrDirectByte(0x80) * 8, 0);	// FIXME: I'm pretty sure we actually pan
+							// by strip, not X/Y, here. Hence *8
 }
 
 void Scumm_v2::o2_walkActorToObject() {
@@ -1018,7 +1019,8 @@
 }
 
 void Scumm_v2::o2_setCameraAt() {
-	setCameraAtEx(getVarOrDirectByte(0x80));
+	setCameraAtEx(getVarOrDirectByte(0x80) * 8);	// FIXME: I'm pretty sure we actually pan
+							// by strip, not X/Y, here. Hence *8
 }
 
 void Scumm_v2::o2_roomOps() {