From 21717273b4064717275bce4b91ea27de744c381f Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 8 May 2005 05:56:09 +0000
Subject: No need to check for speech file in non-talkie versions.

svn-id: r17952
---
 simon/sound.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'simon/sound.cpp')

diff --git a/simon/sound.cpp b/simon/sound.cpp
index 5c02510700..344ff7e472 100644
--- a/simon/sound.cpp
+++ b/simon/sound.cpp
@@ -245,13 +245,11 @@ Sound::Sound(const byte game, const GameSpecificSettings *gss, SoundMixer *mixer
 	_voice_file = false;
 	_ambient_playing = 0;
 
-	if (_game == GAME_SIMON1CD32) {
-		// Uses separate voice files
+	// simon1cd32 uses separate speech files
+	if (!(_game & GF_TALKIE) || (_game == GAME_SIMON1CD32))
 		return;
-	}
 
 	File *file = new File();
-	const char *s;
 
 #ifdef USE_FLAC
 	if (!_voice && gss->flac_filename && gss->flac_filename[0]) {
-- 
cgit v1.2.3