aboutsummaryrefslogtreecommitdiff
path: root/script_v2.cpp
diff options
context:
space:
mode:
authorJames Brown2002-04-22 08:16:16 +0000
committerJames Brown2002-04-22 08:16:16 +0000
commitd447f057094084f55b19a9806ce70a3ed44b96c6 (patch)
treeff83e720762c0353cca39182427f86f1e27f3996 /script_v2.cpp
parentd0d33166345bbe1d98d4e3b766af2b74713f0fc7 (diff)
downloadscummvm-rg350-d447f057094084f55b19a9806ce70a3ed44b96c6.tar.gz
scummvm-rg350-d447f057094084f55b19a9806ce70a3ed44b96c6.tar.bz2
scummvm-rg350-d447f057094084f55b19a9806ce70a3ed44b96c6.zip
Add voice channel tracking to stop script race in BumpusVille VR.
svn-id: r4048
Diffstat (limited to 'script_v2.cpp')
-rw-r--r--script_v2.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/script_v2.cpp b/script_v2.cpp
index 568ed9078e..ad6112d055 100644
--- a/script_v2.cpp
+++ b/script_v2.cpp
@@ -1652,6 +1652,7 @@ void Scumm::o6_isSoundRunning()
int snd = pop();
if (snd)
snd = isSoundRunning(snd);
+
push(snd);
}
@@ -2328,6 +2329,8 @@ void Scumm::o6_wait()
return;
}
case 169:
+ //printf("waiting for message: %d\n", _vars[VAR_HAVE_MSG]);
+
if (_vars[VAR_HAVE_MSG])
break;
return;
@@ -2342,6 +2345,7 @@ void Scumm::o6_wait()
return;
case 171:
+ printf("wait for sentence");
if (_sentenceNum) {
if (sentence[_sentenceNum - 1].unk &&
!isScriptInUse(_vars[VAR_SENTENCE_SCRIPT]))