From 6f2217dcb2e8e51f32f56dcf2cb8444d16634638 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 14 Dec 2003 03:36:47 +0000
Subject: Fixproblem of fotaq attempting to play sfx as music, when sfx are
 disabled.

svn-id: r11623
---
 queen/sound.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'queen')

diff --git a/queen/sound.cpp b/queen/sound.cpp
index 397891248d..113627b6a2 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -143,8 +143,9 @@ void Sound::playSong(int16 songNum) {
 	
 	int16 newTune = _song[songNum - 1].tuneList[0];
 
-	if (_tune[newTune - 1].sfx[0] && sfxOn()) {
-		sfxPlay(_sfxName[_tune[newTune - 1].sfx[0] - 1]);
+	if (_tune[newTune - 1].sfx[0]) {
+		if (sfxOn())
+			sfxPlay(_sfxName[_tune[newTune - 1].sfx[0] - 1]);
 		return;
 	}
 
-- 
cgit v1.2.3