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/d_main.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/d_main.c')
| -rw-r--r-- | src/strife/d_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strife/d_main.c b/src/strife/d_main.c index 544e647b..73de4c9b 100644 --- a/src/strife/d_main.c +++ b/src/strife/d_main.c @@ -582,7 +582,7 @@ void D_DoAdvanceDemo (void) gamestate = GS_DEMOSCREEN; pagename = DEH_String("TITLEPIC"); if ( gamemode == commercial ) - S_StartMusic(mus_dm2ttl); + S_StartMusic(mus_logo); // villsa [STRIFE] TODO - fix music else S_StartMusic (mus_intro); break; @@ -603,7 +603,7 @@ void D_DoAdvanceDemo (void) { pagetic = TICRATE * 11; pagename = DEH_String("TITLEPIC"); - S_StartMusic(mus_dm2ttl); + S_StartMusic(mus_logo); // villsa [STRIFE] TODO - fix music } else { |