aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2010-09-18 14:18:48 +0000
committerTravis Howell2010-09-18 14:18:48 +0000
commitae3b6f0aa391a2352d0e2042a05366c5d80668b7 (patch)
tree39bfc76dbbcbfbe2eb03537973141a4ffc713e71 /engines/scumm/scumm.cpp
parent5b18bb1aa13e7da895b58a4e413797587365cf96 (diff)
downloadscummvm-rg350-ae3b6f0aa391a2352d0e2042a05366c5d80668b7.tar.gz
scummvm-rg350-ae3b6f0aa391a2352d0e2042a05366c5d80668b7.tar.bz2
scummvm-rg350-ae3b6f0aa391a2352d0e2042a05366c5d80668b7.zip
SCUMM: Fix bug #3070077 - MMC64: No music when Syd plays the piano.
svn-id: r52796
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index e5a5da4402..6a841b7a2d 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -698,6 +698,10 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
_activeObject2Inv = false;
_activeObjectObtained = false;
_activeObject2Obtained = false;
+
+ VAR_ACTIVE_ACTOR = 0xFF;
+ VAR_IS_SOUND_RUNNING = 0xFF;
+ VAR_ACTIVE_VERB = 0xFF;
}
ScummEngine_v6::ScummEngine_v6(OSystem *syst, const DetectorResult &dr)
@@ -1931,6 +1935,12 @@ void ScummEngine::waitForTimer(int msec_delay) {
}
}
+void ScummEngine_v0::scummLoop(int delta) {
+ VAR(VAR_IS_SOUND_RUNNING) = (_sound->_lastSound && _sound->isSoundRunning(_sound->_lastSound) != 0);
+
+ ScummEngine::scummLoop(delta);
+}
+
void ScummEngine::scummLoop(int delta) {
if (_game.version >= 3) {
VAR(VAR_TMR_1) += delta;