From 6ec6095cb127421fc648781d0820d23d6e7a58a4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 6 Oct 2013 14:58:44 +0000
Subject: Finish implementation of Hexen CD audio music mode.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2694
---
 src/hexen/p_setup.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/hexen/p_setup.c')

diff --git a/src/hexen/p_setup.c b/src/hexen/p_setup.c
index 57c4ab8c..bf4c5359 100644
--- a/src/hexen/p_setup.c
+++ b/src/hexen/p_setup.c
@@ -671,11 +671,6 @@ void P_GroupLines(void)
 =================
 */
 
-// haleyjd FIXME: CDMUSIC
-#ifdef __WATCOMC__
-extern boolean i_CDMusic;
-#endif
-
 void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
 {
     int i;
@@ -690,15 +685,14 @@ void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
             = players[i].itemcount = 0;
     }
     players[consoleplayer].viewz = 1;   // will be set by player think
- 
-    
-    // haleyjd FIXME: CDMUSIC
-#ifdef __WATCOMC__
-    if (i_CDMusic == false)
+
+    // Waiting-for-level-load song; not played if playing music from CD
+    // (the seek time will be so long it will just make loading take
+    // longer)
+    if (!cdmusic)
     {
-        S_StartSongName("chess", true); // Waiting-for-level-load song
+        S_StartSongName("chess", true);
     }
-#endif
 
     Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
 
-- 
cgit v1.2.3