aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/room.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2011-08-26 05:51:08 +0200
committerJohannes Schickel2011-08-26 05:54:47 +0200
commit4ea4172cbad466738836f7be8ebdcad4eabd0bb9 (patch)
treed8c58fbaeb01f7c653ba27778ffd3acbe91742b0 /engines/scumm/room.cpp
parent479eeb7e47e8bb27551ba49f7d37c36b3b1b88ee (diff)
downloadscummvm-rg350-4ea4172cbad466738836f7be8ebdcad4eabd0bb9.tar.gz
scummvm-rg350-4ea4172cbad466738836f7be8ebdcad4eabd0bb9.tar.bz2
scummvm-rg350-4ea4172cbad466738836f7be8ebdcad4eabd0bb9.zip
SCUMM: Implement proper Indy4 Amiga palette handling.
This should fix incorrect text colors in some scenes.
Diffstat (limited to 'engines/scumm/room.cpp')
-rw-r--r--engines/scumm/room.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index 8962a0e971..63cbef8944 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -552,6 +552,10 @@ void ScummEngine::resetRoomSubBlocks() {
}
}
+ // We need to setup the current palette before initCycl for Indy4 Amiga.
+ if (_PALS_offs || _CLUT_offs)
+ setCurrentPalette(0);
+
// Color cycling
// HE 7.0 games load resources but don't use them.
if (_game.version >= 4 && _game.heversion <= 62) {
@@ -570,9 +574,6 @@ void ScummEngine::resetRoomSubBlocks() {
}
}
#endif
-
- if (_PALS_offs || _CLUT_offs)
- setCurrentPalette(0);
}