diff options
author | Ludvig Strigeus | 2002-04-12 10:34:46 +0000 |
---|---|---|
committer | Ludvig Strigeus | 2002-04-12 10:34:46 +0000 |
commit | 3a4fa636ee4eaeee6bd50d6fcdedf4c3306318b0 (patch) | |
tree | 1fa0750adb7c62924fdbef5c818e0e104ecc5820 /gui.cpp | |
parent | 6e508eed2962fc29f16a4507d056a3c3483c3e6a (diff) | |
download | scummvm-rg350-3a4fa636ee4eaeee6bd50d6fcdedf4c3306318b0.tar.gz scummvm-rg350-3a4fa636ee4eaeee6bd50d6fcdedf4c3306318b0.tar.bz2 scummvm-rg350-3a4fa636ee4eaeee6bd50d6fcdedf4c3306318b0.zip |
code cleanup - prepares for simon inclusion
svn-id: r3910
Diffstat (limited to 'gui.cpp')
-rw-r--r-- | gui.cpp | 33 |
1 files changed, 6 insertions, 27 deletions
@@ -807,36 +807,15 @@ void Gui::addLetter(byte letter) } } -byte Gui::getDefaultColor(int color) -{ - if ((_s->_features & GF_AFTER_V7) || (_s->_features & GF_SMALL_HEADER)) - return 0; - if (_s->_features & GF_AFTER_V6) { - if (color == 8) - color = 1; - return _s->readArray(110, 0, color); - } else { - return _s->getStringAddress(21)[color]; - } -} - void Gui::init(Scumm *s) { + /* Default GUI colors */ + _bgcolor = 0; + _color = 0; + _textcolor = 8; // 15 is nice + _textcolorhi = 15; + _shadowcolor = 0; _s = s; - if (_s->_gameId && !(_s->_features & GF_SMALL_HEADER) - && !(_s->_features & GF_AFTER_V7)) { - _bgcolor = getDefaultColor(0); - _color = getDefaultColor(1); - _textcolor = getDefaultColor(2); - _textcolorhi = getDefaultColor(6); - _shadowcolor = getDefaultColor(8); - } else { - _bgcolor = 0; - _color = 0; - _textcolor = 8; // 15 is nice - _textcolorhi = 15; - _shadowcolor = 0; - } } void Gui::loop(Scumm *s) |