aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2002-09-16 12:10:19 +0000
committerJames Brown2002-09-16 12:10:19 +0000
commit74448d3f776dac2495eea290b930410a2dc71ade (patch)
tree0b5053adacae8be725ebbfb586f51cb80d2dff2a
parenta6c5762817069974dda24e86a08f91380f15d241 (diff)
downloadscummvm-rg350-74448d3f776dac2495eea290b930410a2dc71ade.tar.gz
scummvm-rg350-74448d3f776dac2495eea290b930410a2dc71ade.tar.bz2
scummvm-rg350-74448d3f776dac2495eea290b930410a2dc71ade.zip
Fix some odd regression issue.
Somewhere, recently, current_cd_sound has stopped being set for various things. svn-id: r4951
-rw-r--r--scumm/sound.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index d9ff62ec12..5a0174afcc 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -335,10 +335,10 @@ void Sound::playSound(int sound) {
int track = *ptr;
if (track == _scumm->current_cd_sound)
- result = pollCD();
- if (result == 1) return;
-
- playCDTrack(track, 1, 0, 0);
+ if (pollCD() == 1) return;
+
+ playCDTrack(track, 1, 0, 0);
+ _scumm->current_cd_sound = track;
return;
}