Skip to content

Commit

Permalink
WINTERMUTE: killAllSounds only if WME targetExecutable >= 1.8.6
Browse files Browse the repository at this point in the history
This fixes #6647
  • Loading branch information
tobiatesan authored and somaen committed Nov 4, 2014
1 parent dfe465e commit b460323
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions engines/wintermute/base/base_sprite.cpp
Expand Up @@ -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 {

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit b460323

Please sign in to comment.