diff options
author | Paul Gilbert | 2018-03-05 21:37:08 -0500 |
---|---|---|
committer | Paul Gilbert | 2018-03-05 21:37:08 -0500 |
commit | 82c8d93f3a51f9e0f1625d3bdd2d334fe5b79ae8 (patch) | |
tree | 359dbc74f4496745a7924f8fdce17b067b3580ae /engines | |
parent | e232f13f5dd7c9119d0355cb93ff1cc2c705d16e (diff) | |
download | scummvm-rg350-82c8d93f3a51f9e0f1625d3bdd2d334fe5b79ae8.tar.gz scummvm-rg350-82c8d93f3a51f9e0f1625d3bdd2d334fe5b79ae8.tar.bz2 scummvm-rg350-82c8d93f3a51f9e0f1625d3bdd2d334fe5b79ae8.zip |
XEEN: Sound field renaming for better clarity
Diffstat (limited to 'engines')
-rw-r--r-- | engines/xeen/cutscenes.cpp | 2 | ||||
-rw-r--r-- | engines/xeen/dialogs/dialogs_control_panel.cpp | 4 | ||||
-rw-r--r-- | engines/xeen/sound.cpp | 10 | ||||
-rw-r--r-- | engines/xeen/sound.h | 4 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/clouds_cutscenes.cpp | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/engines/xeen/cutscenes.cpp b/engines/xeen/cutscenes.cpp index 1be9cc30da..e7a604fabc 100644 --- a/engines/xeen/cutscenes.cpp +++ b/engines/xeen/cutscenes.cpp @@ -38,7 +38,7 @@ void Cutscenes::showSubtitles(uint windowIndex) { Sound &sound = *_vm->_sound; Windows &windows = *_vm->_windows; - if (sound._soundOn || _vm->shouldExit()) { + if (sound._fxOn || _vm->shouldExit()) { // Sound is on, so subtitles aren't needed resetSubtitles(0, 0); } else { diff --git a/engines/xeen/dialogs/dialogs_control_panel.cpp b/engines/xeen/dialogs/dialogs_control_panel.cpp index 9c933b30a3..177c7785f8 100644 --- a/engines/xeen/dialogs/dialogs_control_panel.cpp +++ b/engines/xeen/dialogs/dialogs_control_panel.cpp @@ -132,7 +132,7 @@ int ControlPanel::execute() { break; case Common::KEYCODE_e: - sound.setEffectsOn(!sound._soundOn); + sound.setFxOn(!sound._fxOn); break; case Common::KEYCODE_m: @@ -195,7 +195,7 @@ void ControlPanel::loadButtons() { Common::String ControlPanel::getButtonText() { Sound &sound = *g_vm->_sound; - _btnSoundText = sound._soundOn ? Res.ON : Res.OFF; + _btnSoundText = sound._fxOn ? Res.ON : Res.OFF; _btnMusicText = sound._musicOn ? Res.ON : Res.OFF; return Common::String::format(Res.CONTROL_PANEL_BUTTONS, diff --git a/engines/xeen/sound.cpp b/engines/xeen/sound.cpp index 95aabbe266..a82901efe6 100644 --- a/engines/xeen/sound.cpp +++ b/engines/xeen/sound.cpp @@ -28,7 +28,7 @@ namespace Xeen { -Sound::Sound(Audio::Mixer *mixer) : _mixer(mixer), _soundOn(true), _musicOn(true), +Sound::Sound(Audio::Mixer *mixer) : _mixer(mixer), _fxOn(true), _musicOn(true), _songData(nullptr), _effectsData(nullptr), _musicSide(0) { _SoundDriver = new AdlibSoundDriver(); } @@ -43,7 +43,7 @@ Sound::~Sound() { void Sound::playSound(Common::SeekableReadStream &s, int unused) { stopSound(); - if (!_soundOn) + if (!_fxOn) return; s.seek(0); @@ -83,7 +83,7 @@ void Sound::stopAllAudio() { stopSound(); } -void Sound::setEffectsOn(bool isOn) { +void Sound::setFxOn(bool isOn) { ConfMan.setBool("sfx_mute", !isOn); if (isOn) ConfMan.setBool("mute", false); @@ -92,8 +92,8 @@ void Sound::setEffectsOn(bool isOn) { } void Sound::updateSoundSettings() { - _soundOn = !ConfMan.getBool("sfx_mute"); - if (!_soundOn) + _fxOn = !ConfMan.getBool("sfx_mute"); + if (!_fxOn) stopFX(); _musicOn = !ConfMan.getBool("music_mute"); diff --git a/engines/xeen/sound.h b/engines/xeen/sound.h index ab71af9b43..e0629170ef 100644 --- a/engines/xeen/sound.h +++ b/engines/xeen/sound.h @@ -50,7 +50,7 @@ private: */ void update(); public: - bool _soundOn; + bool _fxOn; bool _musicOn; Common::String _currentMusic, _priorMusic; int _musicSide; @@ -118,7 +118,7 @@ public: /** * Sets whether sound effects is on */ - void setEffectsOn(bool isOn); + void setFxOn(bool isOn); /** * Called to reload sound settings diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp index 7a857729db..436abb3b42 100644 --- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp +++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp @@ -339,11 +339,11 @@ bool CloudsCutscenes::showCloudsIntroInner() { } ++lookup; - if (!sound._soundOn && lookup > 30) + if (!sound._fxOn && lookup > 30) lookup = 0; } - if (!sound._soundOn) + if (!sound._fxOn) lineCtr = 20; if (lineCtr == 5) |