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_v0.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_v0.cpp')
| -rw-r--r-- | engines/scumm/script_v0.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index b0e3a958e4..7dc8945595 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -81,7 +81,7 @@ void ScummEngine_v0::setupOpcodes() { /* 24 */ OPCODE(0x24, o_ifNotEqualActiveObject2); OPCODE(0x25, o5_loadRoom); - OPCODE(0x26, o_getClosestObjActor); + OPCODE(0x26, o_getClosestActor); OPCODE(0x27, o2_getActorY); /* 28 */ OPCODE(0x28, o5_equalZero); @@ -161,7 +161,7 @@ void ScummEngine_v0::setupOpcodes() { /* 64 */ OPCODE(0x64, o_ifEqualActiveObject2); OPCODE(0x65, o_stopCurrentScript); - OPCODE(0x66, o_getClosestObjActor); + OPCODE(0x66, o_getClosestActor); OPCODE(0x67, o5_getActorFacing); /* 68 */ OPCODE(0x68, o5_isScriptRunning); @@ -884,31 +884,30 @@ void ScummEngine_v0::o_ifNotEqualActiveObject2() { jumpRelative(!equal); } -void ScummEngine_v0::o_getClosestObjActor() { - int obj; - int act; +void ScummEngine_v0::o_getClosestActor() { + int act, check_act; int dist; // This code can't detect any actors farther away than 255 units // (pixels in newer games, characters in older ones.) But this is // perfectly OK, as it is exactly how the original behaved. - int closest_obj = 0xFF, closest_dist = 0xFF; + int closest_act = 0xFF, closest_dist = 0xFF; getResultPos(); act = getVarOrDirectByte(PARAM_1); - obj = (_opcode & PARAM_2) ? 25 : 7; + check_act = (_opcode & PARAM_2) ? 25 : 7; do { - dist = getObjActToObjActDist(act, obj); + dist = getObjActToObjActDist(actorToObj(act), actorToObj(check_act)); if (dist < closest_dist) { closest_dist = dist; - closest_obj = obj; + closest_act = check_act; } - } while (--obj); + } while (--check_act); - setResult(closest_obj); + setResult(closest_act); } void ScummEngine_v0::o_cutscene() { |