aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-01-15 09:38:15 +0000
committerTravis Howell2006-01-15 09:38:15 +0000
commit1c1e58ce2842f3b2bbe5e495fcec890d6b444e7f (patch)
treef80cf9f5cbeebb196dc48665415b2fc90fa094d0
parent5db5e59701892923df2175e2473de641794c431e (diff)
downloadscummvm-rg350-1c1e58ce2842f3b2bbe5e495fcec890d6b444e7f.tar.gz
scummvm-rg350-1c1e58ce2842f3b2bbe5e495fcec890d6b444e7f.tar.bz2
scummvm-rg350-1c1e58ce2842f3b2bbe5e495fcec890d6b444e7f.zip
Ooops, looping should have been left enabled.
svn-id: r20041
-rw-r--r--scumm/script_v7he.cpp1
-rw-r--r--scumm/sound_he.cpp5
2 files changed, 2 insertions, 4 deletions
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 1ee92ea325..95cb079001 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -591,7 +591,6 @@ void ScummEngine_v70he::o70_resourceRoutines() {
res.unlock(rtRoomImage, resid);
break;
case 116:
- error("CrunchHeap");
break;
case 117: // SO_LOAD_CHARSET
resid = pop();
diff --git a/scumm/sound_he.cpp b/scumm/sound_he.cpp
index 0c029b2713..c3e6411ebd 100644
--- a/scumm/sound_he.cpp
+++ b/scumm/sound_he.cpp
@@ -359,9 +359,8 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
}
musicFile.close();
- _vm->_mixer->stopID(_currentMusic);
- _currentMusic = soundID;
if (_vm->_heversion == 70) {
+ _vm->_mixer->stopHandle(_heSoundChannels[heChannel]);
_vm->_mixer->playRaw(&_heSoundChannels[heChannel], spoolPtr, size, 11025, flags, soundID);
return;
}
@@ -379,7 +378,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
// TODO: Extra sound flags
if (heFlags & 1) {
- //flags |= Audio::Mixer::FLAG_LOOP;
+ flags |= Audio::Mixer::FLAG_LOOP;
}
// Support for sound in later Backyard sports games