diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sword1/control.cpp | 8 | ||||
| -rw-r--r-- | engines/sword1/sword1.cpp | 2 | ||||
| -rw-r--r-- | engines/sword1/sword1.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index c9b4f9f6c2..0384e685b3 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -410,7 +410,7 @@ uint8 Control::runPanel() { ConfMan.setInt("sfx_volume", (int)((volR + volL) / 2)); ConfMan.setInt("sfx_balance", volToBalance(volL, volR)); - ConfMan.setBool("subtitles", SwordEngine::_systemVars.showText == 1); + ConfMan.setBool("subtitles", SwordEngine::_systemVars.showText); ConfMan.flushToDisk(); } @@ -503,8 +503,8 @@ uint8 Control::handleButtonClick(uint8 id, uint8 mode, uint8 *retVal) { (id == BUTTON_DONE) || (id == BUTTON_VOLUME_PANEL)) return id; else if (id == BUTTON_TEXT) { - SwordEngine::_systemVars.showText ^= 1; - _buttons[5]->setSelected(SwordEngine::_systemVars.showText); + SwordEngine::_systemVars.showText = !SwordEngine::_systemVars.showText; + _buttons[5]->setSelected(SwordEngine::_systemVars.showText ? 1 : 0); } else if (id == BUTTON_QUIT) { if (getConfirm(_lStrings[STR_QUIT])) Engine::quitGame(); @@ -566,7 +566,7 @@ void Control::setupMainPanel() { createButtons(_deathButtons, 3); else { createButtons(_panelButtons, 7); - _buttons[5]->setSelected(SwordEngine::_systemVars.showText); + _buttons[5]->setSelected(SwordEngine::_systemVars.showText ? 1 : 0); } if (SwordEngine::_systemVars.controlPanelMode == CP_THEEND) // end of game diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 1556f080e9..1e7b6da4f4 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -154,7 +154,7 @@ Common::Error SwordEngine::init() { _systemVars.showText = ConfMan.getBool("subtitles"); - _systemVars.playSpeech = 1; + _systemVars.playSpeech = true; _mouseState = 0; // Some Mac versions use big endian for the speech files but not all of them. diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h index 8dab522fd0..32375e9a08 100644 --- a/engines/sword1/sword1.h +++ b/engines/sword1/sword1.h @@ -70,8 +70,8 @@ struct SystemVars { uint8 controlPanelMode; // 1 death screen version of the control panel, 2 = successful end of game, 3 = force restart bool forceRestart; bool wantFade; // when true => fade during scene change, else cut. - uint8 playSpeech; - uint8 showText; + bool playSpeech; + bool showText; uint8 language; bool isDemo; Common::Platform platform; |