diff options
| author | Max Horn | 2003-04-30 11:15:11 +0000 |
|---|---|---|
| committer | Max Horn | 2003-04-30 11:15:11 +0000 |
| commit | 4ce574f579a407092ad7f4e0b2c55bbe9e94c020 (patch) | |
| tree | 503a0c6bf31c490de86369ec51b2dfd88301f48c /scumm/script_v5.cpp | |
| parent | d43b6d0cc01669f37651f3a23ae0859ec816ba82 (diff) | |
| download | scummvm-rg350-4ce574f579a407092ad7f4e0b2c55bbe9e94c020.tar.gz scummvm-rg350-4ce574f579a407092ad7f4e0b2c55bbe9e94c020.tar.bz2 scummvm-rg350-4ce574f579a407092ad7f4e0b2c55bbe9e94c020.zip | |
cleanup
svn-id: r7215
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 0916729919..e3bcdaa8a1 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -889,17 +889,17 @@ void Scumm_v5::o5_faceActor() { } void Scumm_v5::o5_findInventory() { - int t; getResultPos(); - t = getVarOrDirectByte(0x80); - setResult(findInventory(t, getVarOrDirectByte(0x40))); + int x = getVarOrDirectByte(0x80); + int y = getVarOrDirectByte(0x40); + setResult(findInventory(x, y)); } void Scumm_v5::o5_findObject() { - int t; getResultPos(); - t = getVarOrDirectWord(0x80); - setResult(findObject(t, getVarOrDirectWord(0x40))); + int x = getVarOrDirectByte(0x80); + int y = getVarOrDirectByte(0x40); + setResult(findObject(x, y)); } void Scumm_v5::o5_freezeScripts() { @@ -1078,7 +1078,7 @@ void Scumm_v5::o5_getClosestObjActor() { getResultPos(); act = getVarOrDirectWord(0x80); - obj = _vars[VAR_V5_OBJECT_HI]; + obj = _vars[VAR_ACTOR_RANGE_MAX]; do { dist = getObjActToObjActDist(act, obj); @@ -1086,7 +1086,7 @@ void Scumm_v5::o5_getClosestObjActor() { closest_dist = dist; closest_obj = obj; } - } while (--obj >= _vars[VAR_V5_OBJECT_LO]); + } while (--obj >= _vars[VAR_ACTOR_RANGE_MIN]); setResult(closest_dist); } |