aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2009-08-09 23:23:48 +0000
committerJohannes Schickel2009-08-09 23:23:48 +0000
commit5a7f85fbf6ce7ea41eb05a883d7b25d0607fefa6 (patch)
tree24adcd368a6212d250738ef0ff0d5fe4e6b4160a /engines/kyra
parent300297d557e0fbd75ccb503233159b1ad7445e05 (diff)
downloadscummvm-rg350-5a7f85fbf6ce7ea41eb05a883d7b25d0607fefa6.tar.gz
scummvm-rg350-5a7f85fbf6ce7ea41eb05a883d7b25d0607fefa6.tar.bz2
scummvm-rg350-5a7f85fbf6ce7ea41eb05a883d7b25d0607fefa6.zip
Unbreak basic Kyra1 amiga in game support, by disabling some palette code for the amiga version.
svn-id: r43188
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/gui_lok.cpp3
-rw-r--r--engines/kyra/text_lok.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 4624aced90..a6e3308082 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -449,7 +449,8 @@ int GUI_LoK::buttonMenuCallback(Button *caller) {
return 0;
}
// XXX
- _screen->setPaletteIndex(0xFE, 60, 60, 0);
+ if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+ _screen->setPaletteIndex(0xFE, 60, 60, 0);
for (int i = 0; i < 6; i++) {
_menuButtonData[i].data0Val1 = _menuButtonData[i].data1Val1 = _menuButtonData[i].data2Val1 = 4;
_menuButtonData[i].data0Callback = _redrawShadedButtonFunctor;
diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp
index 3f4bfb65ac..d01aa2a917 100644
--- a/engines/kyra/text_lok.cpp
+++ b/engines/kyra/text_lok.cpp
@@ -324,7 +324,8 @@ void KyraEngine_LoK::drawSentenceCommand(const char *sentence, int color) {
_screen->hideMouse();
_screen->fillRect(8, 143, 311, 152, 12);
- if (_startSentencePalIndex != color || _fadeText != false) {
+ // TODO: Amiga support
+ if ((_startSentencePalIndex != color || _fadeText != false) && _flags.platform != Common::kPlatformAmiga) {
_currSentenceColor[0] = _screen->getPalette(0)[765] = _screen->getPalette(0)[color*3];
_currSentenceColor[1] = _screen->getPalette(0)[766] = _screen->getPalette(0)[color*3+1];
_currSentenceColor[2] = _screen->getPalette(0)[767] = _screen->getPalette(0)[color*3+2];