aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2003-07-09 14:57:15 +0000
committerJames Brown2003-07-09 14:57:15 +0000
commit90bac4a5ce5ebdc4b320b3cb2c26da3ea35416ed (patch)
tree6a7222725ae00eed1c8e560c95fd6deb1eba54cb
parent53b244f77fec0cff4f0e71b5353a8d7dcbda6b10 (diff)
downloadscummvm-rg350-90bac4a5ce5ebdc4b320b3cb2c26da3ea35416ed.tar.gz
scummvm-rg350-90bac4a5ce5ebdc4b320b3cb2c26da3ea35416ed.tar.bz2
scummvm-rg350-90bac4a5ce5ebdc4b320b3cb2c26da3ea35416ed.zip
Fix compilation, V1 verb positions
svn-id: r8880
-rw-r--r--scumm/debugger.cpp2
-rw-r--r--scumm/script_v2.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index ab33ab264c..5d46f208a4 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -654,7 +654,7 @@ bool ScummDebugger::Cmd_Object(int argc, const char **argv) {
} else if (!strcmp(argv[2], "state")) {
_s->putState(obj, atoi(argv[3]));
//is BgNeedsRedraw enough?
- _s->_BgNeedsRedraw = TRUE;
+ _s->_BgNeedsRedraw = true;
} else {
Debug_Printf("Unknown object command '%s'\nUse <pickup | state> as command\n", argv[2]);
}
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index af7c62030f..06df52eac6 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -816,6 +816,9 @@ void Scumm_v2::o2_verbOps() {
slot = getVarOrDirectByte(0x80) + 1;
/* int unk = */ fetchScriptByte(); // ?
+ if (_version == 1) // V1 Verbs are positioned relative to the 'verb area' - under the sentence
+ y+=9;
+
//printf("o2_verbOps: verb = %d, slot = %d, x = %d, y = %d, unk = %d, name = %s\n",
// verb, slot, x, y, unk, _scriptPointer);