From 74448d3f776dac2495eea290b930410a2dc71ade Mon Sep 17 00:00:00 2001
From: James Brown
Date: Mon, 16 Sep 2002 12:10:19 +0000
Subject: Fix some odd regression issue. Somewhere, recently, current_cd_sound
 has stopped being set for various things.

svn-id: r4951
---
 scumm/sound.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scumm')

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;
 			}
 	
-- 
cgit v1.2.3