diff options
| author | Travis Howell | 2003-10-15 02:38:23 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-10-15 02:38:23 +0000 |
| commit | f74a0c18aa2ef244f987c31d3d146207c72e81ee (patch) | |
| tree | 8ff81ab8e4bfb7eb76283fc1f8d72f93a9fac917 /scumm | |
| parent | a8e1340c45dcad45415a9699a153881c79f78cd9 (diff) | |
| download | scummvm-rg350-f74a0c18aa2ef244f987c31d3d146207c72e81ee.tar.gz scummvm-rg350-f74a0c18aa2ef244f987c31d3d146207c72e81ee.tar.bz2 scummvm-rg350-f74a0c18aa2ef244f987c31d3d146207c72e81ee.zip | |
Version 4 games should use older code style too, checked against loomcd/monkeyvga disasm.
svn-id: r10805
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v5.cpp | 4 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 0769a2ec9f..3822b01d41 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -1482,9 +1482,7 @@ void ScummEngine_v5::o5_loadRoomWithEgo() { startScene(a->room, a, obj); VAR(VAR_WALKTO_OBJ) = 0; - if (_version <= 3) { - // FIXME: Maybe this should also cover V4 games. See also startScene(). - // More investigation (ASM) needed. + if (_version <= 4) { if (!_egoPositioned) { getObjectXYPos(obj, x2, y2, dir); a->putActor(x2, y2, _currentRoom); diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 55a0b604fc..c9aa44c2ef 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1975,9 +1975,7 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { runEntryScript(); if (_version <= 2) runScript(5, 0, 0, 0); - else if (_version >= 4 && _version <= 6) { - // FIXME: The check above maybe should only trigger for V5&V6 games (i.e. not - // for V4). More investigation (ASM) needed. See also o5_loadRoomWithEgo(). + else if (_version >= 5 && _version <= 6) { if (a && !_egoPositioned) { int x, y; getObjectXYPos(objectNr, x, y); |