diff options
author | athrxx | 2019-03-25 22:00:16 +0100 |
---|---|---|
committer | athrxx | 2019-04-13 18:55:00 +0200 |
commit | cbe81aa021bab1082ee6a652cbd15fe323ea2069 (patch) | |
tree | ec4c372d170c5e19545bbd073e3d911487b15dda | |
parent | 02000cfe371784fe5eb46e063a0391fa1ec2001f (diff) | |
download | scummvm-rg350-cbe81aa021bab1082ee6a652cbd15fe323ea2069.tar.gz scummvm-rg350-cbe81aa021bab1082ee6a652cbd15fe323ea2069.tar.bz2 scummvm-rg350-cbe81aa021bab1082ee6a652cbd15fe323ea2069.zip |
KYRA: (EOB2/Amiga) - fix GUI colors
-rw-r--r-- | engines/kyra/engine/darkmoon.cpp | 7 | ||||
-rw-r--r-- | engines/kyra/engine/darkmoon.h | 1 | ||||
-rw-r--r-- | engines/kyra/gui/gui_eob.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/resource/staticres_eob.cpp | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/engines/kyra/engine/darkmoon.cpp b/engines/kyra/engine/darkmoon.cpp index 617cd09252..c7a91c7fd5 100644 --- a/engines/kyra/engine/darkmoon.cpp +++ b/engines/kyra/engine/darkmoon.cpp @@ -495,7 +495,12 @@ void DarkMoonEngine::characterLevelGain(int charIndex) { } const KyraRpgGUISettings *DarkMoonEngine::guiSettings() const { - return (_flags.platform == Common::kPlatformFMTowns) ? &_guiSettingsFMTowns : &_guiSettingsDOS; + if (_flags.platform == Common::kPlatformAmiga) + return &_guiSettingsAmiga; + else if (_flags.platform == Common::kPlatformFMTowns) + return &_guiSettingsFMTowns; + else + return &_guiSettingsDOS; } } // End of namespace Kyra diff --git a/engines/kyra/engine/darkmoon.h b/engines/kyra/engine/darkmoon.h index 16fe8561c5..71bfc75370 100644 --- a/engines/kyra/engine/darkmoon.h +++ b/engines/kyra/engine/darkmoon.h @@ -132,6 +132,7 @@ private: static const KyraRpgGUISettings _guiSettingsDOS; static const KyraRpgGUISettings _guiSettingsFMTowns; + static const KyraRpgGUISettings _guiSettingsAmiga; static const uint8 _egaDefaultPalette[]; }; diff --git a/engines/kyra/gui/gui_eob.cpp b/engines/kyra/gui/gui_eob.cpp index 005c67cb25..bfde732ffe 100644 --- a/engines/kyra/gui/gui_eob.cpp +++ b/engines/kyra/gui/gui_eob.cpp @@ -368,7 +368,7 @@ void EoBCoreEngine::gui_drawHitpoints(int index) { y = 16; w = 51; h = 5; - if (_flags.platform == Common::kPlatformAmiga) + if (_flags.platform == Common::kPlatformAmiga && _flags.gameID == GI_EOB1) bgCol = guiSettings()->colors.sfill; } @@ -4327,7 +4327,7 @@ void GUI_EoB::restParty_updateRestTime(int hours, bool init) { _vm->_txt->clearCurDim(); drawMenuButtonBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, false, false); _screen->copyRegion(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 0, 2, Screen::CR_NO_P_CHECK); - _screen->printShadedText(getMenuString(42), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy + 5, 9, 0, _vm->guiSettings()->colors.guiColorBlack); + _screen->printShadedText(getMenuString(42), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy + 5, _vm->guiSettings()->colors.guiColorLightBlue, 0, _vm->guiSettings()->colors.guiColorBlack); } _screen->setCurPage(0); diff --git a/engines/kyra/resource/staticres_eob.cpp b/engines/kyra/resource/staticres_eob.cpp index a75c464573..20497d05a8 100644 --- a/engines/kyra/resource/staticres_eob.cpp +++ b/engines/kyra/resource/staticres_eob.cpp @@ -1418,6 +1418,11 @@ const KyraRpgGUISettings DarkMoonEngine::_guiSettingsDOS = { { 186, 181, 183, 183, 184, 17, 23, 20, 186, 181, 183, 182, 177, 180, 15, 6, 8, 9, 2, 5, 4, 3, 12 } }; +const KyraRpgGUISettings DarkMoonEngine::_guiSettingsAmiga = { + { 28, 31, 95, 9, 7, { 285, 139 }, { 189, 162 }, { 31, 31 } }, + { 18, 17, 10, 17, 11, 10, 12, 25, 18, 9, 10, 18, 9, 10, 31, 24, 25, 28, 29, 7, 26, 27, 19 } +}; + const uint8 DarkMoonEngine::_egaDefaultPalette[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; |