aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v2.cpp
diff options
context:
space:
mode:
authorJames Brown2003-05-09 05:55:11 +0000
committerJames Brown2003-05-09 05:55:11 +0000
commitc126cf2df83ee9ab4882c3e3387d5e73f8f12870 (patch)
tree255eb289113a3c2abdb4a648cdaa7516d2babd31 /scumm/script_v2.cpp
parent8c8406cf503d721c4d28b149ab7caf683cb60b6b (diff)
downloadscummvm-rg350-c126cf2df83ee9ab4882c3e3387d5e73f8f12870.tar.gz
scummvm-rg350-c126cf2df83ee9ab4882c3e3387d5e73f8f12870.tar.bz2
scummvm-rg350-c126cf2df83ee9ab4882c3e3387d5e73f8f12870.zip
Fix intro room transition. Seems correct, so the fixme is really just explanitory.
svn-id: r7403
Diffstat (limited to 'scumm/script_v2.cpp')
-rw-r--r--scumm/script_v2.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index f1659ba66c..33dc0a3ba4 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -394,7 +394,7 @@ void Scumm_v2::decodeParseString() {
}
*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_startScript() {
}
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_matrixOps() {
}
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() {