diff options
| author | Tobias Gunkel | 2012-01-16 22:32:46 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:28:49 +0100 |
| commit | 347035385e3608c3107db7b9cba0673ce9e03a22 (patch) | |
| tree | 54d5523e3f90cab85ec5c10cd78ccdb00a16f8d9 /engines/scumm/script_v0.cpp | |
| parent | 8141511e2f6eb01a526d6adf3ecf915c656e280c (diff) | |
| download | scummvm-rg350-347035385e3608c3107db7b9cba0673ce9e03a22.tar.gz scummvm-rg350-347035385e3608c3107db7b9cba0673ce9e03a22.tar.bz2 scummvm-rg350-347035385e3608c3107db7b9cba0673ce9e03a22.zip | |
SCUMM: merge object v0 id and type into one object var
Diffstat (limited to 'engines/scumm/script_v0.cpp')
| -rw-r--r-- | engines/scumm/script_v0.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index ac6ee4b9d6..e2ec40ef52 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -365,7 +365,7 @@ uint ScummEngine_v0::fetchScriptWord() { int ScummEngine_v0::getActiveObject() { if (_opcode & PARAM_2) - return OBJECT_V0_NR(_cmdObject); + return OBJECT_V0_ID(_cmdObject); return fetchScriptByte(); } @@ -831,7 +831,7 @@ void ScummEngine_v0::o_doSentence() { bool ScummEngine_v0::ifEqualActiveObject2Common(bool checkType) { byte obj = fetchScriptByte(); if (!checkType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG)) - return (obj == OBJECT_V0_NR(_cmdObject2)); + return (obj == OBJECT_V0_ID(_cmdObject2)); return false; } |