diff options
author | Nicolas Bacca | 2002-05-01 22:16:17 +0000 |
---|---|---|
committer | Nicolas Bacca | 2002-05-01 22:16:17 +0000 |
commit | 1eafbe4d726a860a7f3a952a3b9993eb5e40e563 (patch) | |
tree | bcf037e2dda5d01a0f3c17887b27d73d4fed3387 /gui.cpp | |
parent | 1729234fe23625a521cd16238cefcff64c12c5e9 (diff) | |
download | scummvm-rg350-1eafbe4d726a860a7f3a952a3b9993eb5e40e563.tar.gz scummvm-rg350-1eafbe4d726a860a7f3a952a3b9993eb5e40e563.tar.bz2 scummvm-rg350-1eafbe4d726a860a7f3a952a3b9993eb5e40e563.zip |
Fixed second key page for WinCE, start of volume support
svn-id: r4163
Diffstat (limited to 'gui.cpp')
-rw-r--r-- | gui.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -33,11 +33,11 @@ extern bool toolbar_drawn; extern bool draw_keyboard; extern bool get_key_mapping; extern struct keyops keyMapping; -extern void registry_save(void); +extern void save_key_mapping(void); uint16 _key_mapping_required; uint16 _current_page; #else -#define registry_save() ; +#define save_key_mapping() ; bool get_key_mapping; uint16 _key_mapping_required; #endif @@ -168,7 +168,8 @@ void Gui::drawWidget(const GuiWidget * w) case GUI_VARTEXT: case GUI_KEYTEXT: case GUI_ACTIONTEXT: - case GUI_RESTEXT:{ + case GUI_RESTEXT: + case GUI_NEXTTEXT:{ char text[500]; text[0] = '\0'; @@ -492,7 +493,11 @@ void Gui::handleSoundDialogCommand(int cmd) IMuse *imuse = _s->_imuse; imuse->set_music_volume(_s->_sound_volume_music); imuse->set_master_volume(_s->_sound_volume_master); - registry_save(); + _s->_mixer->set_volume(_s->_sound_volume_sfx); + scummcfg->set("master_volume", _s->_sound_volume_master, "scummvm"); + scummcfg->set("music_volume", _s->_sound_volume_music, "scummvm"); + scummcfg->set("sfx_volume", _s->_sound_volume_sfx, "scummvm"); + scummcfg->flush(); } close(); @@ -545,7 +550,7 @@ void Gui::handleOptionsDialogCommand(int cmd) void Gui::handleKeysDialogCommand(int cmd) { #ifdef _WIN32_WCE - if (cmd < 100 && cmd != 60) { + if (cmd < 100 && cmd != 60 && cmd != 61) { if ((cmd % 10) == 1) setNextType((_current_page * 5) + (cmd / 10) - 1); @@ -562,7 +567,7 @@ void Gui::handleKeysDialogCommand(int cmd) if (cmd == 60) { get_key_mapping = false; - registry_save(); + save_key_mapping(); close(); } @@ -893,6 +898,7 @@ void Gui::close() draw_keyboard = false; toolbar_drawn = false; } + #endif } |