aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/actor.cpp2
-rw-r--r--scumm/sound_he.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index c7d7b75c2b..939bd5fb90 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1563,7 +1563,7 @@ void Actor::setActorCostume(int c) {
if (_vm->_heversion >= 71 && _vm->getTalkingActor() == _number) {
if (_vm->_heversion <= 95 || (_vm->_heversion >= 98 && _vm->VAR(_vm->VAR_SKIP_RESET_TALK_ACTOR) == 0)) {
- _vm->setTalkingActor(0);
+ //_vm->setTalkingActor(0);
}
}
}
diff --git a/scumm/sound_he.cpp b/scumm/sound_he.cpp
index a941ca3b22..342c9f581d 100644
--- a/scumm/sound_he.cpp
+++ b/scumm/sound_he.cpp
@@ -439,7 +439,8 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) {
_overrideFreq = 0;
}
- if ((heFlags & 1) || (heFlags & 4)) {
+ // Bit 3 is looping related too
+ if ((heFlags & 1)) {
flags |= Audio::Mixer::FLAG_LOOP;
}