diff options
author | Paul Gilbert | 2008-01-05 12:09:24 +0000 |
---|---|---|
committer | Paul Gilbert | 2008-01-05 12:09:24 +0000 |
commit | 62fdf1afa0e9d497d4bd08c1fa5c4452518b2cb5 (patch) | |
tree | c86f11564b6c41a8e56d48376ea16d84117e6f40 | |
parent | 705bd9236c6f56e90f3c27dd42051cc408156494 (diff) | |
download | scummvm-rg350-62fdf1afa0e9d497d4bd08c1fa5c4452518b2cb5.tar.gz scummvm-rg350-62fdf1afa0e9d497d4bd08c1fa5c4452518b2cb5.tar.bz2 scummvm-rg350-62fdf1afa0e9d497d4bd08c1fa5c4452518b2cb5.zip |
Changed room change code for an immediate transition when in EGA mode (which can't do fades)
svn-id: r30236
-rw-r--r-- | engines/lure/room.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp index d9a7597cb7..58f73f5556 100644 --- a/engines/lure/room.cpp +++ b/engines/lure/room.cpp @@ -559,9 +559,12 @@ void Room::setRoomNumber(uint16 newRoomNumber, bool showOverlay) { _descId = _roomData->descId; if (fadeFlag) { - // Fade out all the colours except the high index 0FFh, which is used to show the - // disk cursor as a room changes - _screen.paletteFadeOut(GAME_COLOURS - 1); + if (isEGA) + _screen.setPaletteEmpty(); + else + // Fade out all the colours except the high index 0FFh, which is used to show the + // disk cursor as a room changes + _screen.paletteFadeOut(GAME_COLOURS - 1); // Deallocate graphical layers from the room for (int layerNum = 0; layerNum < _numLayers; ++layerNum) { @@ -628,7 +631,7 @@ void Room::setRoomNumber(uint16 newRoomNumber, bool showOverlay) { update(); _screen.update(); - if (fadeFlag) + if (fadeFlag && !isEGA) _screen.paletteFadeIn(p); else _screen.setPalette(p); |