diff options
| author | Travis Howell | 2006-01-05 09:27:02 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-01-05 09:27:02 +0000 |
| commit | 8ae6c259ad78d3a2e1db981e5a665db5c14c319e (patch) | |
| tree | bb0f097de27b1dcf95e910c55fdeb37f598c8a7a | |
| parent | 2f7acd49add4c34db73def3773dd453d5d45d341 (diff) | |
| download | scummvm-rg350-8ae6c259ad78d3a2e1db981e5a665db5c14c319e.tar.gz scummvm-rg350-8ae6c259ad78d3a2e1db981e5a665db5c14c319e.tar.bz2 scummvm-rg350-8ae6c259ad78d3a2e1db981e5a665db5c14c319e.zip | |
Revert, might be HE100 only.
svn-id: r19915
| -rw-r--r-- | scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound_he.cpp | 3 |
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; } |