aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobia Tesan2014-10-05 11:52:26 +0200
committerEinar Johan Trøan Sømåen2014-11-04 17:52:25 +0100
commitb460323e58e189650dc03e67d75b3a193f7a6685 (patch)
treeace61478f9fe87a6258d8cd5a38eaef5c0f41683
parentdfe465e26ba88b850644979cbd9835d296fca728 (diff)
downloadscummvm-rg350-b460323e58e189650dc03e67d75b3a193f7a6685.tar.gz
scummvm-rg350-b460323e58e189650dc03e67d75b3a193f7a6685.tar.bz2
scummvm-rg350-b460323e58e189650dc03e67d75b3a193f7a6685.zip
WINTERMUTE: killAllSounds only if WME targetExecutable >= 1.8.6
This fixes #6647
-rw-r--r--engines/wintermute/base/base_sprite.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index 04060bff32..09e138a1fd 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -41,6 +41,7 @@
#include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/game_description.h"
namespace Wintermute {
@@ -347,9 +348,17 @@ void BaseSprite::reset() {
} else {
_currentFrame = -1;
}
-
- killAllSounds();
-
+ if (BaseEngine::instance().getTargetExecutable() >= WME_1_8_6) {
+ /*
+ * This was added in WME 1.8.6
+ *
+ * 5MA and possibly other games ship with pre-1.8.6 WME, and
+ * depends (e.g.: menu sounds, etc) on this not being triggered.
+ *
+ * See bug #6647
+ */
+ killAllSounds();
+ }
_lastFrameTime = 0;
_finished = false;
_moveX = _moveY = 0;