diff options
| author | Tobias Gunkel | 2012-01-11 22:57:46 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:28:40 +0100 |
| commit | 621017ce65f3c5b346c3b17bd4e6700af13215c6 (patch) | |
| tree | c8ad2f95ba4522b1b07ce437ebc0427052517493 /engines | |
| parent | ffcd6004613d42d924d20a42694e870c041dadaa (diff) | |
| download | scummvm-rg350-621017ce65f3c5b346c3b17bd4e6700af13215c6.tar.gz scummvm-rg350-621017ce65f3c5b346c3b17bd4e6700af13215c6.tar.bz2 scummvm-rg350-621017ce65f3c5b346c3b17bd4e6700af13215c6.zip | |
SCUMM: remove some NOTEs/TODOs
- o5_breakHere() seems to be still needed. For example edna does not manage to walk up the ladder if this is not enabled.
- numLocalObjects seems to be big enough so that < instead of <= can be used. The original interpreter only uses the local ids 0 .. 44 whereas scummvm has _numLocalObjects set to 200.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/object.cpp | 1 | ||||
| -rw-r--r-- | engines/scumm/script_v5.cpp | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index 26597864fd..86d9065385 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -499,7 +499,6 @@ int ScummEngine::findObject(int x, int y) { byte a; const int mask = (_game.version <= 2) ? kObjectState_08 : 0xF; - // FIXME(TOBIAS): <= _numLocalObjects? for (i = 1; i < _numLocalObjects; i++) { if ((_objs[i].obj_nr < 1) || getClass(_objs[i].obj_nr, kObjectClassUntouchable)) continue; diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index 1d68e86942..707c3c2397 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -2493,11 +2493,8 @@ void ScummEngine_v5::walkActorToActor(int actor, int toActor, int dist) { a->startWalkActor(x, y, -1); // WORKAROUND: See bug #2971126 for details on why this is here. - if (_game.version == 0) { - // FIXME(TOBIAS): is this still needed? - // (updateScriptPtr/_currentScript might now be called automatically) + if (_game.version == 0) o5_breakHere(); - } } void ScummEngine_v5::o5_walkActorToActor() { |