thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ACCESS: Merge the sound resource and priority lists

Browse source
This commit is contained in:
Paul Gilbert 2014-11-07 22:09:09 -05:00
parent 63bacba2d9
commit dc218d53ef
7 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/access/scripts.cpp
View file

@ -707,15 +707,14 @@ void Scripts::cmdLoadSound() {
int idx = _data->readSint16LE();
_vm->_sound->_soundTable.clear();
_vm->_sound->_soundPriority.clear();
_vm->_sound->_soundTable.push_back(_vm->_files->loadFile(_vm->_extraCells[idx]._vidSound));
_vm->_sound->_soundPriority.push_back(1);
Resource *sound = _vm->_files->loadFile(_vm->_extraCells[idx]._vidSound);
_vm->_sound->_soundTable.push_back(SoundEntry(sound, 1));
}
void Scripts::cmdFreeSound() {
SoundManager &sound = *_vm->_sound;
if (sound._soundTable.size() > 0 && sound._soundTable[0]) {
if (sound._soundTable.size() > 0 && sound._soundTable[0]._res) {
// Keep doing char display loop if playing sound for it
do {
if (_vm->_flags[236] == 1)
@ -725,8 +724,8 @@ void Scripts::cmdFreeSound() {
} while (!_vm->shouldQuit() && sound._playingSound);
// Free the sound
delete sound._soundTable[0];
sound._soundTable[0] = nullptr;
delete sound._soundTable[0]._res;
sound._soundTable.remove_at(0);
}
}
@ -766,8 +765,7 @@ void Scripts::cmdDead() {
_vm->_screen->forceFadeOut();
cmdFreeSound();
_vm->_sound->_soundTable[0] = _vm->_files->loadFile(98, 44);
_vm->_sound->_soundPriority[1] = 1;
_vm->_sound->_soundTable.push_back(SoundEntry(_vm->_files->loadFile(98, 44), 1));
_vm->_screen->clearScreen();
_vm->_screen->setPanel(3);