diff options
| author | Tobias Gunkel | 2012-01-22 22:58:10 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:29:13 +0100 |
| commit | 96f8fc6ca9889d30db11b854c95ffd65bb88034d (patch) | |
| tree | e8c765f1f68123433f6f36063b7e4e2479c83d58 /engines/scumm/script_v2.cpp | |
| parent | fd4a3501ede75d87c06980b5ac563402da834f25 (diff) | |
| download | scummvm-rg350-96f8fc6ca9889d30db11b854c95ffd65bb88034d.tar.gz scummvm-rg350-96f8fc6ca9889d30db11b854c95ffd65bb88034d.tar.bz2 scummvm-rg350-96f8fc6ca9889d30db11b854c95ffd65bb88034d.zip | |
SCUMM: Fix actor ID handling in v0
Some object functions allow actor IDs and object IDs as parameters. They are easily distinguishable in engines > 0 as actor IDs are < _numActors and object IDs are bigger. In v0 this is not the case as there are objects with IDs like 3 and 5 (e.g. the hamster). So object ID handling was unified for v0 and the other engines by introducing objIsActor(), objToActor() and ActorToObj().
Diffstat (limited to 'engines/scumm/script_v2.cpp')
| -rw-r--r-- | engines/scumm/script_v2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 6f6138d411..59500deaf5 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -1315,7 +1315,7 @@ void ScummEngine_v2::o2_getActorX() { getResultPos(); a = getVarOrDirectByte(PARAM_1); - setResult(getObjX(a)); + setResult(getObjX(actorToObj(a))); } void ScummEngine_v2::o2_getActorY() { @@ -1323,7 +1323,7 @@ void ScummEngine_v2::o2_getActorY() { getResultPos(); a = getVarOrDirectByte(PARAM_1); - setResult(getObjY(a)); + setResult(getObjY(actorToObj(a))); } void ScummEngine_v2::o2_isGreater() { |