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/input.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/input.cpp')
| -rw-r--r-- | engines/agos/input.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index 35ed045675..5fc2a64416 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -99,7 +99,7 @@ void AGOSEngine::setup_cond_c_helper() { animMax = 9; } - _animatePointer = 0; + _animatePointer = false; _mouseCursor = cursor; _mouseAnimMax = animMax; _mouseAnim = 1; @@ -574,13 +574,13 @@ bool AGOSEngine::processSpecialKeys() { if (getGameType() == GType_FF || (getGameType() == GType_SIMON2 && (getFeatures() & GF_TALKIE)) || ((getFeatures() & GF_TALKIE) && _language != Common::EN_ANY && _language != Common::DE_DEU)) { if (_speech) - _subtitles ^= 1; + _subtitles = !_subtitles; } break; case 'v': if (getGameType() == GType_FF || (getGameType() == GType_SIMON2 && (getFeatures() & GF_TALKIE))) { if (_subtitles) - _speech ^= 1; + _speech = !_speech; } break; case '+': @@ -598,7 +598,7 @@ bool AGOSEngine::processSpecialKeys() { syncSoundSettings(); break; case 'm': - _musicPaused ^= 1; + _musicPaused = !_musicPaused; if (_midiEnabled) { _midi.pause(_musicPaused); } @@ -606,14 +606,16 @@ bool AGOSEngine::processSpecialKeys() { break; case 's': if (getGameId() == GID_SIMON1DOS) { - _midi._enable_sfx ^= 1; + _midi._enable_sfx = !_midi._enable_sfx; } else { - _sound->effectsPause(_effectsPaused ^= 1); + _effectsPaused = !_effectsPaused; + _sound->effectsPause(_effectsPaused); } break; case 'b': if (getGameType() == GType_SIMON2) { - _sound->ambientPause(_ambientPaused ^= 1); + _ambientPaused = !_ambientPaused; + _sound->ambientPause(_ambientPaused); } break; default: |