libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NEVERHOOD: Delete all sound/music items on exit

Browse Source 
- Minor cleanup
This commit is contained in:
johndoe123 2013-01-29 12:03:05 +00:00 committed by Willem Jan Palenstijn
parent c96d2475b1
commit 70fdfd9d57
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/neverhood/menumodule.cpp
View File

@ -178,7 +178,6 @@ void MenuModule::updateScene() {
}
uint32 MenuModule::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
// TODO CHECKME Handles 0x101F, possibly just a debug/cache message which can be ignored?
return Module::handleMessage(messageNum, param, sender);;
}

22
engines/neverhood/sound.cpp
View File

@ -233,21 +233,18 @@ void SoundItem::setVolume(int volume) {
void SoundItem::update() {
if (_playOnceAfterCountdown) {
if (_currCountdown == 0) {
if (_currCountdown == 0)
_currCountdown = _initialCountdown;
} else if (--_currCountdown == 0) {
else if (--_currCountdown == 0)
_soundResource->play();
}
} else if (_playOnceAfterRandomCountdown) {
if (_currCountdown == 0) {
if (_minCountdown > 0 && _maxCountdown > 0 && _minCountdown < _maxCountdown)
_currCountdown = _vm->_rnd->getRandomNumberRng(_minCountdown, _maxCountdown);
} else if (--_currCountdown == 0) {
} else if (--_currCountdown == 0)
_soundResource->play();
}
} else if (_playLooping && !_soundResource->isPlaying()) {
_soundResource->play(); // TODO Looping parameter?
}
} else if (_playLooping && !_soundResource->isPlaying())
_soundResource->play();
}
// SoundMan
@ -257,7 +254,10 @@ SoundMan::SoundMan(NeverhoodEngine *vm)
}
SoundMan::~SoundMan() {
// TODO Clean up
for (uint i = 0; i < _soundItems.size(); ++i)
delete _soundItems[i];
for (uint i = 0; i < _musicItems.size(); ++i)
delete _musicItems[i];
}
void SoundMan::addMusic(uint32 groupNameHash, uint32 musicFileHash) {
@ -709,6 +709,10 @@ AudioResourceMan::AudioResourceMan(NeverhoodEngine *vm)
}
AudioResourceMan::~AudioResourceMan() {
for (uint i = 0; i < _soundItems.size(); ++i)
delete _soundItems[i];
for (uint i = 0; i < _musicItems.size(); ++i)
delete _musicItems[i];
}
int16 AudioResourceMan::addSound(uint32 fileHash) {