From 0d1fcc1bb8650ee03a547d5a98270e51ff685089 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 9 Sep 2006 21:44:51 +0000
Subject: Fix the -nomusic parameter.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 603
---
 src/i_sound.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/i_sound.c b/src/i_sound.c
index 131e4cca..eb600cd6 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: i_sound.c 568 2006-07-28 19:13:13Z fraggle $
+// $Id: i_sound.c 603 2006-09-09 21:44:51Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -128,7 +128,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: i_sound.c 568 2006-07-28 19:13:13Z fraggle $";
+rcsid[] = "$Id: i_sound.c 603 2006-09-09 21:44:51Z fraggle $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -559,12 +559,11 @@ I_InitSound()
     
     SDL_PauseAudio(0);
 
-    music_initialised = true;
+    if (M_CheckParm("-nomusic") == 0)
+        music_initialised = true;
 
-    if (M_CheckParm("-nosound") || M_CheckParm("-nosfx"))
-        return;
-
-    sound_initialised = true;
+    if (M_CheckParm("-nosfx") == 0)
+        sound_initialised = true;
 }
 
 
-- 
cgit v1.2.3