diff options
| author | Paul Gilbert | 2015-05-01 19:13:53 -1000 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-01 19:13:53 -1000 |
| commit | 7cf9fcd44e58a5a4b1988bb5ca6ec6862170c3d8 (patch) | |
| tree | fe8ec2d64b00e51baed8c3364ded12d65b6c8957 | |
| parent | 850bd739687129542c37db0beebd17369c71ed15 (diff) | |
| download | scummvm-rg350-7cf9fcd44e58a5a4b1988bb5ca6ec6862170c3d8.tar.gz scummvm-rg350-7cf9fcd44e58a5a4b1988bb5ca6ec6862170c3d8.tar.bz2 scummvm-rg350-7cf9fcd44e58a5a4b1988bb5ca6ec6862170c3d8.zip | |
SHERLOCK: Change _helpStyle from int to bool
| -rw-r--r-- | engines/sherlock/settings.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/sherlock.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/user_interface.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/user_interface.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/settings.cpp b/engines/sherlock/settings.cpp index aeeb92d3c1..1673eca389 100644 --- a/engines/sherlock/settings.cpp +++ b/engines/sherlock/settings.cpp @@ -298,7 +298,7 @@ void Settings::show(SherlockEngine *vm) { if ((found == 4 && events._released) || ui._key == 'A') { // Help button style - ui._helpStyle ^= 1; + ui._helpStyle = !ui._helpStyle; updateConfig = true; settings.drawInteface(true); } diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp index f546e0d878..c33ecb6d49 100644 --- a/engines/sherlock/sherlock.cpp +++ b/engines/sherlock/sherlock.cpp @@ -217,7 +217,7 @@ void SherlockEngine::loadConfig() { if (ConfMan.hasKey("fade_style")) _screen->_fadeStyle = ConfMan.getBool("fade_style"); if (ConfMan.hasKey("help_style")) - _ui->_helpStyle = ConfMan.getInt("help_style"); + _ui->_helpStyle = ConfMan.getBool("help_style"); if (ConfMan.hasKey("window_style")) _ui->_windowStyle = ConfMan.getInt("window_style"); if (ConfMan.hasKey("portraits_on")) @@ -234,7 +234,7 @@ void SherlockEngine::saveConfig() { ConfMan.setInt("font", _screen->fontNumber()); ConfMan.setBool("fade_style", _screen->_fadeStyle); - ConfMan.setInt("help_style", _ui->_helpStyle); + ConfMan.setBool("help_style", _ui->_helpStyle); ConfMan.setInt("window_style", _ui->_windowStyle); ConfMan.setBool("portraits_on", _people->_portraitsOn); diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp index 73058e8fd8..d75e0770b9 100644 --- a/engines/sherlock/user_interface.cpp +++ b/engines/sherlock/user_interface.cpp @@ -86,7 +86,7 @@ UserInterface::UserInterface(SherlockEngine *vm) : _vm(vm) { _bgFound = 0; _oldBgFound = -1; _keycode = Common::KEYCODE_INVALID; - _helpStyle = 0; + _helpStyle = false; _menuCounter = 0; _menuMode = STD_MODE; _help = _oldHelp = 0; diff --git a/engines/sherlock/user_interface.h b/engines/sherlock/user_interface.h index 89a33801dd..a0b854af36 100644 --- a/engines/sherlock/user_interface.h +++ b/engines/sherlock/user_interface.h @@ -123,7 +123,7 @@ public: int _invLookFlag; int _temp1; int _windowStyle; - int _helpStyle; + bool _helpStyle; public: UserInterface(SherlockEngine *vm); ~UserInterface(); |