diff options
| author | Johannes Schickel | 2011-02-16 00:14:37 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-16 00:14:37 +0100 |
| commit | 7d0f5c9f1cb089c0d1f89989655a640b3e837840 (patch) | |
| tree | 5cd3f94eb723cc65912cdde633c0dd10738908af /engines/sky/debug.cpp | |
| parent | 46c5732ba54be263019f59a98d3ea7a2118e60a4 (diff) | |
| parent | 12fd50929533a5ba1ea26ccc1e5de0b5c3f83f50 (diff) | |
| download | scummvm-rg350-7d0f5c9f1cb089c0d1f89989655a640b3e837840.tar.gz scummvm-rg350-7d0f5c9f1cb089c0d1f89989655a640b3e837840.tar.bz2 scummvm-rg350-7d0f5c9f1cb089c0d1f89989655a640b3e837840.zip | |
Merge branch 'master' into osystem-palette
Conflicts:
engines/sky/screen.h
Diffstat (limited to 'engines/sky/debug.cpp')
| -rw-r--r-- | engines/sky/debug.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp index b43ec917fe..2839665ff8 100644 --- a/engines/sky/debug.cpp +++ b/engines/sky/debug.cpp @@ -1071,11 +1071,11 @@ void Debug::logic(uint32 logic) { void Debug::script(uint32 command, uint16 *scriptData) { debug(6, "SCRIPT: %s", opcodes[command]); if (command == 0 || command == 6) - debug(6, " %s", scriptVars[READ_LE_UINT16(scriptData)/4]); + debug(6, " %s", scriptVars[(*scriptData)/4]); else { int i; for (i = 0; i < opcode_par[command]; i++) { - debug(6, " %d", READ_LE_UINT16(scriptData + i)); + debug(6, " %d", *(scriptData + i)); } } debug(6, " "); // Print an empty line as separator |