aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTobias Gunkel2012-01-15 23:51:28 +0100
committerTobias Gunkel2012-02-11 08:28:48 +0100
commit8141511e2f6eb01a526d6adf3ecf915c656e280c (patch)
tree20e5ea43e00107e58654049ca1036d61baac96e1 /engines/scumm
parentc138ef67099cd14bedd4e0e79080e31e2b41eddd (diff)
downloadscummvm-rg350-8141511e2f6eb01a526d6adf3ecf915c656e280c.tar.gz
scummvm-rg350-8141511e2f6eb01a526d6adf3ecf915c656e280c.tar.bz2
scummvm-rg350-8141511e2f6eb01a526d6adf3ecf915c656e280c.zip
SCUMM: fix ScummEngine_v0::ifEqualActiveObject2Common() parameter name
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/script_v0.cpp4
-rw-r--r--engines/scumm/scumm_v0.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index a40dd44727..ac6ee4b9d6 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -828,9 +828,9 @@ void ScummEngine_v0::o_doSentence() {
doSentence(verb, obj, obj2);
}
-bool ScummEngine_v0::ifEqualActiveObject2Common(bool ignoreType) {
+bool ScummEngine_v0::ifEqualActiveObject2Common(bool checkType) {
byte obj = fetchScriptByte();
- if (!ignoreType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG))
+ if (!checkType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG))
return (obj == OBJECT_V0_NR(_cmdObject2));
return false;
}
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 6b49cc0ddf..cdae22e983 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -102,7 +102,7 @@ protected:
virtual bool areBoxesNeighbors(int box1nr, int box2nr);
- bool ifEqualActiveObject2Common(bool ignoreType);
+ bool ifEqualActiveObject2Common(bool checkType);
/* Version C64 script opcodes */
void o_stopCurrentScript();