aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-12-13 23:03:25 -0500
committerPaul Gilbert2013-12-13 23:03:25 -0500
commit208c5aa6b75f31135fda7af7484b17ca1b14c82d (patch)
treecd6d42b98fd8543ddf6bbb7b5435a35047a4259b
parentb80d0e9aa3c6d7fe3706a7e634623559a36e4548 (diff)
downloadscummvm-rg350-208c5aa6b75f31135fda7af7484b17ca1b14c82d.tar.gz
scummvm-rg350-208c5aa6b75f31135fda7af7484b17ca1b14c82d.tar.bz2
scummvm-rg350-208c5aa6b75f31135fda7af7484b17ca1b14c82d.zip
VOYEUR: Fix for parsePlayCommands command 9
-rw-r--r--engines/voyeur/files_threads.cpp7
-rw-r--r--engines/voyeur/voyeur.cpp1
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 67df87fd78..3880893c29 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -348,6 +348,8 @@ void ThreadResource::parsePlayCommands() {
for (int parseIndex = 0; parseIndex < _parseCount; ++parseIndex) {
uint16 id = READ_LE_UINT16(dataP);
+ debugC(DEBUG_BASIC, kDebugScripts, "parsePlayCommands (%d of %d) - cmd #%d",
+ parseIndex, _parseCount, id);
dataP += 2;
switch (id) {
@@ -606,8 +608,9 @@ void ThreadResource::parsePlayCommands() {
while (_vm->_voy._arr5[idx][v3] != 9999)
++idx;
- _vm->_voy._arr5[idx][v3] = READ_LE_UINT16(dataP + 4) + READ_LE_UINT16(dataP + 6);
- _vm->_voy._arr6[idx][v3] = v3;
+ v2 = READ_LE_UINT16(dataP + 4);
+ _vm->_voy._arr5[idx][v3] = v2;
+ _vm->_voy._arr6[idx][v3] = v2 + READ_LE_UINT16(dataP + 6) - 2;
}
dataP += 8;
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 3b924fe759..b8f0babb6f 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -38,6 +38,7 @@ VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc)
_defaultFontInfo(3, 0xff, 0xff, 0, 0, ALIGN_LEFT, 0, Common::Point(), 1, 1,
Common::Point(1, 1), 1, 0, 0) {
DebugMan.addDebugChannel(kDebugPath, "Path", "Pathfinding debug level");
+ DebugMan.addDebugChannel(kDebugScripts, "scripts", "Game scripts");
_bVoy = NULL;
_iForceDeath = -1;
_controlPtr = NULL;