diff options
author | Vincent Hamm | 2002-03-25 18:17:40 +0000 |
---|---|---|
committer | Vincent Hamm | 2002-03-25 18:17:40 +0000 |
commit | 13bf453232d27ad2cde9ce25ebeb14c2665a9385 (patch) | |
tree | 4f136d425534a6773a3f8c4bb51ea6b1f83fbc41 /gui.cpp | |
parent | 8d08bdd5dc4cf3c0986cb51462fe03e3528343fe (diff) | |
download | scummvm-rg350-13bf453232d27ad2cde9ce25ebeb14c2665a9385.tar.gz scummvm-rg350-13bf453232d27ad2cde9ce25ebeb14c2665a9385.tar.bz2 scummvm-rg350-13bf453232d27ad2cde9ce25ebeb14c2665a9385.zip |
Forced colors for V7 gui...(temporary hack). Now the gui colors are reseted every time it's opened
svn-id: r3832
Diffstat (limited to 'gui.cpp')
-rw-r--r-- | gui.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -630,7 +630,7 @@ void Gui::handleCommand(int cmd) { close(); return; case 9: /* options button */ - options(); + options(_s); draw(0, 100); return; default: @@ -772,7 +772,7 @@ byte Gui::getDefaultColor(int color) { void Gui::init(Scumm *s) { _s = s; - if (_s->_gameId && !(_s->_features & GF_SMALL_HEADER)) { + if (_s->_gameId && !(_s->_features & GF_SMALL_HEADER) && !(_s->_features & GF_AFTER_V7)) { _bgcolor = getDefaultColor(0); _color = getDefaultColor(1); _textcolor = getDefaultColor(2); @@ -787,7 +787,8 @@ void Gui::init(Scumm *s) { } } -void Gui::loop() { +void Gui::loop(Scumm *s) { + init(s); if (_active==1) { _active++; draw(0,200); // was 100 @@ -837,7 +838,8 @@ void Gui::close() { #endif } -void Gui::saveLoadDialog() { +void Gui::saveLoadDialog(Scumm *s) { + init(s); _widgets[0] = save_load_dialog; _editString = -1; _cur_page = 0; @@ -845,21 +847,24 @@ void Gui::saveLoadDialog() { _dialog = SAVELOAD_DIALOG; } -void Gui::pause() { +void Gui::pause(Scumm *s) { + init(s); _widgets[0] = pause_dialog; _cur_page = 0; _active = true; _dialog = PAUSE_DIALOG; } -void Gui::options() { +void Gui::options(Scumm *s) { + init(s); _widgets[0] = options_dialog; _active = true; _cur_page = 0; _dialog = OPTIONS_DIALOG; } -void Gui::launcher() { +void Gui::launcher(Scumm *s) { + init(s); _widgets[0] = launcher_dialog; _active = true; _cur_page = 0; |