summaryrefslogtreecommitdiff
path: root/src/strife/st_stuff.c
diff options
context:
space:
mode:
authorSamuel Villareal2010-08-31 01:37:11 +0000
committerSamuel Villareal2010-08-31 01:37:11 +0000
commitb6ea4375e0b5db116a1cdf27e30273d4a92b7a53 (patch)
treee531ff8da0b7e4149d99b585d69469dfb4793e59 /src/strife/st_stuff.c
parent1ae6058ab5c492f6f8e7fd606c9ad452f0b861ae (diff)
downloadchocolate-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/st_stuff.c')
-rw-r--r--src/strife/st_stuff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strife/st_stuff.c b/src/strife/st_stuff.c
index 160244ce..6312faf3 100644
--- a/src/strife/st_stuff.c
+++ b/src/strife/st_stuff.c
@@ -528,7 +528,7 @@ ST_Responder (event_t* ev)
if (gamemode == commercial)
{
- musnum = mus_runnin + (buf[0]-'0')*10 + buf[1]-'0' - 1;
+ musnum = mus_logo + (buf[0]-'0')*10 + buf[1]-'0' - 1; // villsa [STRIFE] TODO - fix music
if (((buf[0]-'0')*10 + buf[1]-'0') > 35)
plyr->message = DEH_String(STSTR_NOMUS);
@@ -537,7 +537,7 @@ ST_Responder (event_t* ev)
}
else
{
- musnum = mus_e1m1 + (buf[0]-'1')*9 + (buf[1]-'1');
+ musnum = mus_logo + (buf[0]-'1')*9 + (buf[1]-'1'); // villsa [STRIFE] TODO - fix music
if (((buf[0]-'1')*9 + buf[1]-'1') > 31)
plyr->message = DEH_String(STSTR_NOMUS);