diff options
| author | Samuel Villareal | 2010-08-31 01:37:11 +0000 |
|---|---|---|
| committer | Samuel Villareal | 2010-08-31 01:37:11 +0000 |
| commit | b6ea4375e0b5db116a1cdf27e30273d4a92b7a53 (patch) | |
| tree | e531ff8da0b7e4149d99b585d69469dfb4793e59 /src/strife/s_sound.c | |
| parent | 1ae6058ab5c492f6f8e7fd606c9ad452f0b861ae (diff) | |
| download | chocolate-doom-b6ea4375e0b5db116a1cdf27e30273d4a92b7a53.tar.gz chocolate-doom-b6ea4375e0b5db116a1cdf27e30273d4a92b7a53.tar.bz2 chocolate-doom-b6ea4375e0b5db116a1cdf27e30273d4a92b7a53.zip | |
+ Strife music/sound implemented
+ All doom sound references replaced with sfx_swish as placeholder
+ Removed all but MT_PLAYER mobjinfo in mobjinfo struct
Subversion-branch: /branches/strife-branch
Subversion-revision: 1980
Diffstat (limited to 'src/strife/s_sound.c')
| -rw-r--r-- | src/strife/s_sound.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/strife/s_sound.c b/src/strife/s_sound.c index 36b9ec76..c7d6a14f 100644 --- a/src/strife/s_sound.c +++ b/src/strife/s_sound.c @@ -223,28 +223,29 @@ void S_Start(void) if (gamemode == commercial) { - mnum = mus_runnin + gamemap - 1; + mnum = mus_logo + gamemap - 1; // villsa [STRIFE] TODO - fix music } else { + // villsa [STRIFE] TODO - fix music int spmus[]= { // Song - Who? - Where? - mus_e3m4, // American e4m1 - mus_e3m2, // Romero e4m2 - mus_e3m3, // Shawn e4m3 - mus_e1m5, // American e4m4 - mus_e2m7, // Tim e4m5 - mus_e2m4, // Romero e4m6 - mus_e2m6, // J.Anderson e4m7 CHIRON.WAD - mus_e2m5, // Shawn e4m8 - mus_e1m9, // Tim e4m9 + 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_e1m1 + (gameepisode-1)*9 + gamemap-1; + mnum = mus_logo + (gameepisode-1)*9 + gamemap-1; // villsa [STRIFE] TODO - fix music } else { |