aboutsummaryrefslogtreecommitdiff
path: root/simon/sound.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-05-06 11:37:33 +0000
committerTravis Howell2005-05-06 11:37:33 +0000
commit076e42c302dd463e42d5bbd31eedccf3463f7a61 (patch)
tree8ff3fc355d85976a5a7dddecc02e48a9092fcf3f /simon/sound.cpp
parentd04492a05a39a427ad5f0892a688e5122465ed3d (diff)
downloadscummvm-rg350-076e42c302dd463e42d5bbd31eedccf3463f7a61.tar.gz
scummvm-rg350-076e42c302dd463e42d5bbd31eedccf3463f7a61.tar.bz2
scummvm-rg350-076e42c302dd463e42d5bbd31eedccf3463f7a61.zip
Use ScummVM code formatting for names.
svn-id: r17930
Diffstat (limited to 'simon/sound.cpp')
-rw-r--r--simon/sound.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp
index 2ccea96f05..1dfbb78b31 100644
--- a/simon/sound.cpp
+++ b/simon/sound.cpp
@@ -234,8 +234,8 @@ Sound::Sound(const byte game, const GameSpecificSettings *gss, SoundMixer *mixer
_voice = 0;
_effects = 0;
- _effects_paused = false;
- _ambient_paused = false;
+ _effectsPaused = false;
+ _ambientPaused = false;
_filenums = 0;
_last_voice_file = 0;
@@ -455,7 +455,7 @@ void Sound::playEffects(uint sound) {
if (!_effects)
return;
- if (_effects_paused)
+ if (_effectsPaused)
return;
_effects->playSound(sound, &_effects_handle, (_game == GAME_SIMON1CD32) ? 0 : SoundMixer::FLAG_UNSIGNED);
@@ -470,7 +470,7 @@ void Sound::playAmbient(uint sound) {
_ambient_playing = sound;
- if (_ambient_paused)
+ if (_ambientPaused)
return;
_mixer->stopHandle(_ambient_handle);
@@ -491,13 +491,13 @@ void Sound::stopAll() {
}
void Sound::effectsPause(bool b) {
- _effects_paused = b;
+ _effectsPaused = b;
}
void Sound::ambientPause(bool b) {
- _ambient_paused = b;
+ _ambientPaused = b;
- if (_ambient_paused && _ambient_playing) {
+ if (_ambientPaused && _ambient_playing) {
_mixer->stopHandle(_ambient_handle);
} else if (_ambient_playing) {
uint tmp = _ambient_playing;