+ 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

1 files changed, 173 insertions, 175 deletions

diff --git a/src/strife/sounds.c b/src/strife/sounds.c
index adfb2189..c87dd6d4 100644
--- a/src/strife/sounds.c
+++ b/src/strife/sounds.c
@@ -39,76 +39,46 @@
 #define MUSIC(name) \
     { name, 0, NULL, NULL }
 
+// villsa [STRIFE]
 musicinfo_t S_music[] =
 {
     MUSIC(NULL),
-    MUSIC("e1m1"),
-    MUSIC("e1m2"),
-    MUSIC("e1m3"),
-    MUSIC("e1m4"),
-    MUSIC("e1m5"),
-    MUSIC("e1m6"),
-    MUSIC("e1m7"),
-    MUSIC("e1m8"),
-    MUSIC("e1m9"),
-    MUSIC("e2m1"),
-    MUSIC("e2m2"),
-    MUSIC("e2m3"),
-    MUSIC("e2m4"),
-    MUSIC("e2m5"),
-    MUSIC("e2m6"),
-    MUSIC("e2m7"),
-    MUSIC("e2m8"),
-    MUSIC("e2m9"),
-    MUSIC("e3m1"),
-    MUSIC("e3m2"),
-    MUSIC("e3m3"),
-    MUSIC("e3m4"),
-    MUSIC("e3m5"),
-    MUSIC("e3m6"),
-    MUSIC("e3m7"),
-    MUSIC("e3m8"),
-    MUSIC("e3m9"),
-    MUSIC("inter"),
+    MUSIC("logo"),
+    MUSIC("action"),
+    MUSIC("tavern"),
+    MUSIC("danger"),
+    MUSIC("fast"),
     MUSIC("intro"),
-    MUSIC("bunny"),
-    MUSIC("victor"),
-    MUSIC("introa"),
-    MUSIC("runnin"),
-    MUSIC("stalks"),
-    MUSIC("countd"),
-    MUSIC("betwee"),
-    MUSIC("doom"),
-    MUSIC("the_da"),
-    MUSIC("shawn"),
-    MUSIC("ddtblu"),
-    MUSIC("in_cit"),
-    MUSIC("dead"),
-    MUSIC("stlks2"),
-    MUSIC("theda2"),
-    MUSIC("doom2"),
-    MUSIC("ddtbl2"),
-    MUSIC("runni2"),
-    MUSIC("dead2"),
-    MUSIC("stlks3"),
-    MUSIC("romero"),
-    MUSIC("shawn2"),
-    MUSIC("messag"),
-    MUSIC("count2"),
-    MUSIC("ddtbl3"),
-    MUSIC("ampie"),
-    MUSIC("theda3"),
-    MUSIC("adrian"),
-    MUSIC("messg2"),
-    MUSIC("romer2"),
-    MUSIC("tense"),
-    MUSIC("shawn3"),
-    MUSIC("openin"),
-    MUSIC("evil"),
-    MUSIC("ultima"),
-    MUSIC("read_m"),
-    MUSIC("dm2ttl"),
-    MUSIC("dm2int") 
+    MUSIC("darker"),
+    MUSIC("strike"),
+    MUSIC("slide"),
+    MUSIC("tribal"),
+    MUSIC("march"),
+    MUSIC("danger"),
+    MUSIC("mood"),
+    MUSIC("castle"),
+    MUSIC("darker"),
+    MUSIC("action"),
+    MUSIC("fight"),
+    MUSIC("spense"),
+    MUSIC("slide"),
+    MUSIC("strike"),
+    MUSIC("dark"),
+    MUSIC("tech"),
+    MUSIC("slide"),
+    MUSIC("drone"),
+    MUSIC("panthr"),
+    MUSIC("sad"),
+    MUSIC("instry"),
+    MUSIC("tech"),
+    MUSIC("action"),
+    MUSIC("instry"),
+    MUSIC("drone"),
+    MUSIC("fight"),
+    MUSIC("happy"),
+    MUSIC("end")
+
+
 };
 
 
@@ -121,117 +91,145 @@ musicinfo_t S_music[] =
 #define SOUND_LINK(name, priority, link_id, pitch, volume) \
   { NULL, name, priority, &S_sfx[link_id], pitch, volume, 0, 0, -1, NULL }
 
+// villsa [STRIFE]
 sfxinfo_t S_sfx[] =
 {
   // S_sfx[0] needs to be a dummy for odd reasons.
-  SOUND("none",   0),
-  SOUND("pistol", 64),
-  SOUND("shotgn", 64),
-  SOUND("sgcock", 64),
-  SOUND("dshtgn", 64),
-  SOUND("dbopn",  64),
-  SOUND("dbcls",  64),
-  SOUND("dbload", 64),
-  SOUND("plasma", 64),
-  SOUND("bfg",    64),
-  SOUND("sawup",  64),
-  SOUND("sawidl", 118),
-  SOUND("sawful", 64),
-  SOUND("sawhit", 64),
-  SOUND("rlaunc", 64),
-  SOUND("rxplod", 70),
-  SOUND("firsht", 70),
-  SOUND("firxpl", 70),
-  SOUND("pstart", 100),
-  SOUND("pstop",  100),
-  SOUND("doropn", 100),
-  SOUND("dorcls", 100),
-  SOUND("stnmov", 119),
-  SOUND("swtchn", 78),
-  SOUND("swtchx", 78),
-  SOUND("plpain", 96),
-  SOUND("dmpain", 96),
-  SOUND("popain", 96),
-  SOUND("vipain", 96),
-  SOUND("mnpain", 96),
-  SOUND("pepain", 96),
-  SOUND("slop",   78),
-  SOUND("itemup", 78),
-  SOUND("wpnup",  78),
-  SOUND("oof",    96),
-  SOUND("telept", 32),
-  SOUND("posit1", 98),
-  SOUND("posit2", 98),
-  SOUND("posit3", 98),
-  SOUND("bgsit1", 98),
-  SOUND("bgsit2", 98),
-  SOUND("sgtsit", 98),
-  SOUND("cacsit", 98),
-  SOUND("brssit", 94),
-  SOUND("cybsit", 92),
-  SOUND("spisit", 90),
-  SOUND("bspsit", 90),
-  SOUND("kntsit", 90),
-  SOUND("vilsit", 90),
-  SOUND("mansit", 90),
-  SOUND("pesit",  90),
-  SOUND("sklatk", 70),
-  SOUND("sgtatk", 70),
-  SOUND("skepch", 70),
-  SOUND("vilatk", 70),
-  SOUND("claw",   70),
-  SOUND("skeswg", 70),
-  SOUND("pldeth", 32),
-  SOUND("pdiehi", 32),
-  SOUND("podth1", 70),
-  SOUND("podth2", 70),
-  SOUND("podth3", 70),
-  SOUND("bgdth1", 70),
-  SOUND("bgdth2", 70),
-  SOUND("sgtdth", 70),
-  SOUND("cacdth", 70),
-  SOUND("skldth", 70),
-  SOUND("brsdth", 32),
-  SOUND("cybdth", 32),
-  SOUND("spidth", 32),
-  SOUND("bspdth", 32),
-  SOUND("vildth", 32),
-  SOUND("kntdth", 32),
-  SOUND("pedth",  32),
-  SOUND("skedth", 32),
-  SOUND("posact", 120),
-  SOUND("bgact",  120),
-  SOUND("dmact",  120),
-  SOUND("bspact", 100),
-  SOUND("bspwlk", 100),
-  SOUND("vilact", 100),
-  SOUND("noway",  78),
-  SOUND("barexp", 60),
-  SOUND("punch",  64),
-  SOUND("hoof",   70),
-  SOUND("metal",  70),
-  SOUND_LINK("chgun", 64, sfx_pistol, 150, 0),
-  SOUND("tink",   60),
-  SOUND("bdopn",  100),
-  SOUND("bdcls",  100),
-  SOUND("itmbk",  100),
-  SOUND("flame",  32),
-  SOUND("flamst", 32),
-  SOUND("getpow", 60),
-  SOUND("bospit", 70),
-  SOUND("boscub", 70),
-  SOUND("bossit", 70),
-  SOUND("bospn",  70),
-  SOUND("bosdth", 70),
-  SOUND("manatk", 70),
-  SOUND("mandth", 70),
-  SOUND("sssit",  70),
-  SOUND("ssdth",  70),
-  SOUND("keenpn", 70),
-  SOUND("keendt", 70),
-  SOUND("skeact", 70),
-  SOUND("skesit", 70),
-  SOUND("skeatk", 70),
-  SOUND("radio",  60),
+  SOUND("none",     0),
+  SOUND("swish",     64),
+  SOUND("meatht",    64),
+  SOUND("mtalht",    64),
+  SOUND("wpnup",     78),
+  SOUND("rifle",     64),
+  SOUND("mislht",    64),
+  SOUND("barexp",    32),
+  SOUND("flburn",    64),
+  SOUND("flidl",     118),
+  SOUND("agrsee",    98),
+  SOUND("plpain",    96),
+  SOUND("pcrush",    96),
+  SOUND("pespna",    98),
+  SOUND("pespnb",    98),
+  SOUND("pespnc",    98),
+  SOUND("pespnd",    98),
+  SOUND("agrdpn",    98),
+  SOUND("pldeth",    32),
+  SOUND("plxdth",    32),
+  SOUND("slop",      78),
+  SOUND("rebdth",    98),
+  SOUND("agrdth",    98),
+  SOUND("lgfire",    211),
+  SOUND("smfire",    211),
+  SOUND("alarm",     210),
+  SOUND("drlmto",    98),
+  SOUND("drlmtc",    98),
+  SOUND("drsmto",    98),
+  SOUND("drsmtc",    98),
+  SOUND("drlwud",    98),
+  SOUND("drswud",    98),
+  SOUND("drston",    98),
+  SOUND("bdopn",     98),
+  SOUND("bdcls",     98),
+  SOUND("swtchn",    78),
+  SOUND("swbolt",    98),
+  SOUND("swscan",    98),
+  SOUND("yeah",      10),
+  SOUND("mask",      210),
+  SOUND("pstart",    100),
+  SOUND("pstop",     100),
+  SOUND("itemup",    78),
+  SOUND("bglass",    200),
+  SOUND("wriver",    201),
+  SOUND("wfall",     201),
+  SOUND("wdrip",     201),
+  SOUND("wsplsh",    95),
+  SOUND("rebact",    200),
+  SOUND("agrac1",    98),
+  SOUND("agrac2",    98),
+  SOUND("agrac3",    98),
+  SOUND("agrac4",    98),
+  SOUND("ambppl",    218),
+  SOUND("ambbar",    218),
+  SOUND("telept",    32),
+  SOUND("ratact",    99),
+  SOUND("itmbk",     100),
+  SOUND("xbow",      99),
+  SOUND("burnme",    95),
+  SOUND("oof",       96),
+  SOUND("wbrldt",    98),
+  SOUND("psdtha",    109),
+  SOUND("psdthb",    109),
+  SOUND("psdthc",    109),
+  SOUND("rb2pn",     96),
+  SOUND("rb2dth",    32),
+  SOUND("rb2see",    98),
+  SOUND("rb2act",    98),
+  SOUND("firxpl",    70),
+  SOUND("stnmov",    100),
+  SOUND("noway",     78),
+  SOUND("rlaunc",    64),
+  SOUND("rflite",    65),
+  SOUND("radio",     60),
+  SOUND("pulchn",    98),
+  SOUND("swknob",    98),
+  SOUND("keycrd",    98),
+  SOUND("swston",    98),
+  SOUND("sntsee",    98),
+  SOUND("sntdth",    98),
+  SOUND("sntact",    98),
+  SOUND("pgrdat",    64),
+  SOUND("pgrsee",    90),
+  SOUND("pgrdpn",    96),
+  SOUND("pgrdth",    32),
+  SOUND("pgract",    120),
+  SOUND("proton",    64),
+  SOUND("protfl",    64),
+  SOUND("plasma",    64),
+  SOUND("dsrptr",    30),
+  SOUND("reavat",    64),
+  SOUND("revbld",    64),
+  SOUND("revsee",    90),
+  SOUND("reavpn",    96),
+  SOUND("revdth",    32),
+  SOUND("revact",    120),
+  SOUND("spisit",    90),
+  SOUND("spdwlk",    65),
+  SOUND("spidth",    32),
+  SOUND("spdatk",    32),
+  SOUND("chant",     218),
+  SOUND("static",    32),
+  SOUND("chain",     70),
+  SOUND("tend",      100),
+  SOUND("phoot",     32),
+  SOUND("explod",    32),
+  SOUND("sigil",     32),
+  SOUND("sglhit",    32),
+  SOUND("siglup",    32),
+  SOUND("prgpn",     96),
+  SOUND("progac",    120),
+  SOUND("lorpn",     96),
+  SOUND("lorsee",    90),
+  SOUND("difool",    32),
+  SOUND("inqdth",    32),
+  SOUND("inqact",    98),
+  SOUND("inqsee",    90),
+  SOUND("inqjmp",    65),
+  SOUND("amaln1",    99),
+  SOUND("amaln2",    99),
+  SOUND("amaln3",    99),
+  SOUND("amaln4",    99),
+  SOUND("amaln5",    99),
+  SOUND("amaln6",    99),
+  SOUND("mnalse",    64),
+  SOUND("alnsee",    64),
+  SOUND("alnpn",     96),
+  SOUND("alnact",    120),
+  SOUND("alndth",    32),
+  SOUND("mnaldt",    32),
+  SOUND("reactr",    31),
+  SOUND("airlck",    98),
+  SOUND("drchno",    98),
+  SOUND("drchnc",    98),
+  SOUND("valve",     98)
 };