libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LAB: Get rid of _doReset

Browse Source 
This resulted in calling resetMusic() twice
This commit is contained in:
Filippos Karapetis 2015-12-27 14:13:39 +02:00
parent 86a593af09
commit bce260bb5f
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/lab/music.cpp
View File

@ -58,7 +58,6 @@ Music::Music(LabEngine *vm) : _vm(vm) {
_musicOn = false;
_queuingAudioStream = nullptr;
_lastMusicRoom = 1;
_doReset = true;
}
void Music::updateMusic() {
@ -220,8 +219,6 @@ void Music::checkRoomMusic() {
changeMusic("Music:Laugh");
else if (_vm->_roomNum == DIMROOM)
changeMusic("Music:Rm81");
else if (_doReset)
resetMusic();
_lastMusicRoom = _vm->_roomNum;
}

2
engines/lab/music.h
View File

@ -52,7 +52,6 @@ private:
Common::File *_file;
Common::File *_tFile;
bool _doReset;
bool _musicOn;
bool _musicPaused;
bool _oldMusicOn;
@ -125,7 +124,6 @@ public:
* Turns the music on and off.
*/
void setMusic(bool on);
void setMusicReset(bool reset) { _doReset = reset; }
void stopSoundEffect();
/**

2
engines/lab/processroom.cpp
View File

@ -386,12 +386,10 @@ void LabEngine::doActions(const ActionList &actionList) {
case kActionChangeMusic:
_music->changeMusic(action->_messages[0]);
_music->setMusicReset(false);
break;
case kActionResetMusic:
_music->resetMusic();
_music->setMusicReset(true);
break;
case kActionFillMusic: