diff options
| author | Simon Howard | 2013-10-06 14:58:44 +0000 |
|---|---|---|
| committer | Simon Howard | 2013-10-06 14:58:44 +0000 |
| commit | 6ec6095cb127421fc648781d0820d23d6e7a58a4 (patch) | |
| tree | eafd74cee78d87112b726c59d4e2f9576fb2370a /src/hexen/p_setup.c | |
| parent | 9a4f30c23a7b87e5f5bf3e4e4039c845cba38d66 (diff) | |
| download | chocolate-doom-6ec6095cb127421fc648781d0820d23d6e7a58a4.tar.gz chocolate-doom-6ec6095cb127421fc648781d0820d23d6e7a58a4.tar.bz2 chocolate-doom-6ec6095cb127421fc648781d0820d23d6e7a58a4.zip | |
Finish implementation of Hexen CD audio music mode.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2694
Diffstat (limited to 'src/hexen/p_setup.c')
| -rw-r--r-- | src/hexen/p_setup.c | 18 |
1 files changed, 6 insertions, 12 deletions
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); |