diff options
author | Strangerke | 2011-11-14 18:19:32 +0100 |
---|---|---|
committer | Strangerke | 2011-11-14 18:19:32 +0100 |
commit | 1e607dc22d08dd9e35c53f2168161600dfbcb89a (patch) | |
tree | 85b01c42c6bd3abf344e3fc813963f2f2a4d1c1f /engines | |
parent | ba29ff4735b20781845728550ffae46118c6aa34 (diff) | |
download | scummvm-rg350-1e607dc22d08dd9e35c53f2168161600dfbcb89a.tar.gz scummvm-rg350-1e607dc22d08dd9e35c53f2168161600dfbcb89a.tar.bz2 scummvm-rg350-1e607dc22d08dd9e35c53f2168161600dfbcb89a.zip |
TSAGE: Rename a variable using double-underscore (reserved)
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/sound.cpp | 14 | ||||
-rw-r--r-- | engines/tsage/sound.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp index b61e63236b..fb88a5ff5e 100644 --- a/engines/tsage/sound.cpp +++ b/engines/tsage/sound.cpp @@ -36,7 +36,7 @@ static SoundManager *_soundManager = NULL; SoundManager::SoundManager() { _soundManager = this; - __sndmgrReady = false; + _sndmgrReady = false; _ourSndResVersion = 0x102; _ourDrvResVersion = 0x10A; @@ -52,7 +52,7 @@ SoundManager::SoundManager() { } SoundManager::~SoundManager() { - if (__sndmgrReady) { + if (_sndmgrReady) { Common::StackLock slock(_serverDisabledMutex); g_vm->_mixer->stopAll(); @@ -83,7 +83,7 @@ SoundManager::~SoundManager() { } void SoundManager::postInit() { - if (!__sndmgrReady) { + if (!_sndmgrReady) { g_saver->addSaveNotifier(&SoundManager::saveNotifier); g_saver->addLoadNotifier(&SoundManager::loadNotifier); g_saver->addListener(this); @@ -94,7 +94,7 @@ void SoundManager::postInit() { // thread, and doesn't get too far ahead, I've left it to the AdlibSoundDriver class to // call the update method, rather than having it be called separately // g_system->getTimerManager()->installTimerProc(_sfUpdateCallback, 1000000 / SOUND_FREQUENCY, NULL, "tsageSoundUpdate"); - __sndmgrReady = true; + _sndmgrReady = true; } } @@ -136,7 +136,7 @@ void SoundManager::update() { } Common::List<SoundDriverEntry> &SoundManager::buildDriverList(bool detectFlag) { - assert(__sndmgrReady); + assert(_sndmgrReady); _availableDrivers.clear(); // Build up a list of available drivers. Currently we only implement an Adlib music @@ -549,7 +549,7 @@ void SoundManager::loadNotifier(bool postFlag) { void SoundManager::loadNotifierProc(bool postFlag) { if (!postFlag) { // Stop any currently playing sounds - if (__sndmgrReady) { + if (_sndmgrReady) { Common::StackLock slock(_serverDisabledMutex); for (Common::List<Sound *>::iterator i = _soundList.begin(); i != _soundList.end(); ) { @@ -569,7 +569,7 @@ void SoundManager::loadNotifierProc(bool postFlag) { void SoundManager::listenerSynchronize(Serializer &s) { s.validate("SoundManager"); - assert(__sndmgrReady && _driversDetected); + assert(_sndmgrReady && _driversDetected); if (s.getVersion() < 6) return; diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h index 5802a62686..f4286565b0 100644 --- a/engines/tsage/sound.h +++ b/engines/tsage/sound.h @@ -169,7 +169,7 @@ class SoundManager : public SaveListener { private: SoundDriver *instantiateDriver(int driverNum); public: - bool __sndmgrReady; + bool _sndmgrReady; int _ourSndResVersion, _ourDrvResVersion; SynchronizedList<Sound *> _playList; Common::List<SoundDriver *> _installedDrivers; |