diff options
| author | Torbjörn Andersson | 2010-07-04 07:32:12 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-07-04 07:32:12 +0000 |
| commit | dde6dabac9d6ae6f86cec11607ac15cb748aaf73 (patch) | |
| tree | b93d12e78e653db039a226c3d8ef776d6d0e05c5 /engines/agos/agos.cpp | |
| parent | db01417447a38f66503d33f1fd0b0ec20b5299a9 (diff) | |
| download | scummvm-rg350-dde6dabac9d6ae6f86cec11607ac15cb748aaf73.tar.gz scummvm-rg350-dde6dabac9d6ae6f86cec11607ac15cb748aaf73.tar.bz2 scummvm-rg350-dde6dabac9d6ae6f86cec11607ac15cb748aaf73.zip | |
Cleanup: Treat booleans as booleans, not integers. (I hope I didn't mess up,
because that would cause some nasty regressions...)
svn-id: r50643
Diffstat (limited to 'engines/agos/agos.cpp')
| -rw-r--r-- | engines/agos/agos.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 3ccf6fc18f..8f0e69ffdb 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -202,19 +202,19 @@ AGOSEngine::AGOSEngine(OSystem *syst) _scanFlag = false; _scriptVar2 = 0; - _runScriptReturn1 = 0; - _skipVgaWait = 0; - _noParentNotify = 0; - _beardLoaded = 0; - _litBoxFlag = 0; - _mortalFlag = 0; + _runScriptReturn1 = false; + _skipVgaWait = false; + _noParentNotify = false; + _beardLoaded = false; + _litBoxFlag = false; + _mortalFlag = false; _displayFlag = 0; - _syncFlag2 = 0; - _inCallBack = 0; - _cepeFlag = 0; - _fastMode = 0; + _syncFlag2 = false; + _inCallBack = false; + _cepeFlag = false; + _fastMode = false; - _backFlag = 0; + _backFlag = false; _debugMode = 0; _dumpScripts = false; @@ -631,9 +631,11 @@ Common::Error AGOSEngine::init() { if (ConfMan.hasKey("sfx_mute") && ConfMan.getBool("sfx_mute") == 1) { if (getGameId() == GID_SIMON1DOS) - _midi._enable_sfx ^= 1; - else - _sound->effectsPause(_effectsPaused ^= 1); + _midi._enable_sfx = !_midi._enable_sfx; + else { + _effectsPaused = !_effectsPaused; + _sound->effectsPause(_effectsPaused); + } } _copyProtection = ConfMan.getBool("copy_protection"); @@ -648,7 +650,7 @@ Common::Error AGOSEngine::init() { if (getGameType() == GType_SIMON1) { // English and German versions don't have full subtitles - if (_language == Common::EN_ANY || _language == Common::DE_DEU) + if (_language == Common::EN_ANY || _language == Common::DE_DEU) _subtitles = false; // Other versions require speech to be enabled else |