mirror of
https://github.com/libretro/scummvm.git
synced 2025-05-13 09:36:21 +00:00
Version 4 games should use older code style too, checked against loomcd/monkeyvga disasm.
svn-id: r10805
This commit is contained in:
parent
a8e1340c45
commit
f74a0c18aa
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user