diff options
| author | James Haley | 2010-08-31 23:55:12 +0000 |
|---|---|---|
| committer | James Haley | 2010-08-31 23:55:12 +0000 |
| commit | 71e330f910d9e803c08fe38c02c6828e71dda38f (patch) | |
| tree | d8b5e25b08a16cddafa4170f251fa5ae8ed2fae0 /src/strife/s_sound.c | |
| parent | 9104ddc3f46312a3356b10d7a21f9e304a1403a5 (diff) | |
| download | chocolate-doom-71e330f910d9e803c08fe38c02c6828e71dda38f.tar.gz chocolate-doom-71e330f910d9e803c08fe38c02c6828e71dda38f.tar.bz2 chocolate-doom-71e330f910d9e803c08fe38c02c6828e71dda38f.zip | |
Replace M_NEWG with M_NGAME in menus, disable DOOM status bar, and get
the proper music playing on all levels. This really feels like Strife
now :)
Subversion-branch: /branches/strife-branch
Subversion-revision: 1990
Diffstat (limited to 'src/strife/s_sound.c')
| -rw-r--r-- | src/strife/s_sound.c | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/src/strife/s_sound.c b/src/strife/s_sound.c index c7d6a14f..6ea28afe 100644 --- a/src/strife/s_sound.c +++ b/src/strife/s_sound.c @@ -202,7 +202,9 @@ static void S_StopChannel(int cnum) // Kills playing sounds at start of level, // determines music if any, changes music. // - +// haleyjd 08/31/10: [STRIFE] +// * Removed DOOM music handling and replaced with Strife code. +// void S_Start(void) { int cnum; @@ -221,40 +223,14 @@ void S_Start(void) // start new music for the level mus_paused = 0; - if (gamemode == commercial) - { - mnum = mus_logo + gamemap - 1; // villsa [STRIFE] TODO - fix music - } + // [STRIFE] Some interesting math here ;) + if(gamemap <= 31) + mnum = 1; else - { - // villsa [STRIFE] TODO - fix music - int spmus[]= - { - // Song - Who? - Where? - - mus_logo, // American e4m1 - mus_logo, // Romero e4m2 - mus_logo, // Shawn e4m3 - mus_logo, // American e4m4 - mus_logo, // Tim e4m5 - mus_logo, // Romero e4m6 - mus_logo, // J.Anderson e4m7 CHIRON.WAD - mus_logo, // Shawn e4m8 - mus_logo, // Tim e4m9 - }; - - if (gameepisode < 4) - { - mnum = mus_logo + (gameepisode-1)*9 + gamemap-1; // villsa [STRIFE] TODO - fix music - } - else - { - mnum = spmus[gamemap-1]; - } - } + mnum = -30; - S_ChangeMusic(mnum, true); -} + S_ChangeMusic(gamemap + mnum, true); +} void S_StopSound(mobj_t *origin) { |