1 files changed, 163 insertions, 168 deletions
diff --git a/src/strife/sounds.h b/src/strife/sounds.h
index 3d190910..4236a5da 100644
--- a/src/strife/sounds.h
+++ b/src/strife/sounds.h
@@ -40,76 +40,44 @@ extern musicinfo_t	S_music[];
 // Identifiers for all music in game.
 //
 
+// villsa [STRIFE]
 typedef enum
 {
     mus_None,
-    mus_e1m1,
-    mus_e1m2,
-    mus_e1m3,
-    mus_e1m4,
-    mus_e1m5,
-    mus_e1m6,
-    mus_e1m7,
-    mus_e1m8,
-    mus_e1m9,
-    mus_e2m1,
-    mus_e2m2,
-    mus_e2m3,
-    mus_e2m4,
-    mus_e2m5,
-    mus_e2m6,
-    mus_e2m7,
-    mus_e2m8,
-    mus_e2m9,
-    mus_e3m1,
-    mus_e3m2,
-    mus_e3m3,
-    mus_e3m4,
-    mus_e3m5,
-    mus_e3m6,
-    mus_e3m7,
-    mus_e3m8,
-    mus_e3m9,
-    mus_inter,
+    mus_logo,
+    mus_action,
+    mus_tavern,
+    mus_danger,
+    mus_fast,
     mus_intro,
-    mus_bunny,
-    mus_victor,
-    mus_introa,
-    mus_runnin,
-    mus_stalks,
-    mus_countd,
-    mus_betwee,
-    mus_doom,
-    mus_the_da,
-    mus_shawn,
-    mus_ddtblu,
-    mus_in_cit,
-    mus_dead,
-    mus_stlks2,
-    mus_theda2,
-    mus_doom2,
-    mus_ddtbl2,
-    mus_runni2,
-    mus_dead2,
-    mus_stlks3,
-    mus_romero,
-    mus_shawn2,
-    mus_messag,
-    mus_count2,
-    mus_ddtbl3,
-    mus_ampie,
-    mus_theda3,
-    mus_adrian,
-    mus_messg2,
-    mus_romer2,
-    mus_tense,
-    mus_shawn3,
-    mus_openin,
-    mus_evil,
-    mus_ultima,
-    mus_read_m,
-    mus_dm2ttl,
-    mus_dm2int,
+    mus_darker,
+    mus_strike,
+    mus_slide,
+    mus_tribal,
+    mus_march,
+    mus_danger2,
+    mus_mood,
+    mus_castle,
+    mus_darker2,
+    mus_action2,
+    mus_fight,
+    mus_spense,
+    mus_slide2,
+    mus_strike2,
+    mus_dark,
+    mus_tech,
+    mus_slide3,
+    mus_drone,
+    mus_panthr,
+    mus_sad,
+    mus_instry,
+    mus_tech2,
+    mus_action3,
+    mus_instry2,
+    mus_drone2,
+    mus_fight2,
+    mus_happy,
+    mus_end,
     NUMMUSIC
 } musicenum_t;
 
@@ -121,114 +89,141 @@ typedef enum
 typedef enum
 {
     sfx_None,
-    sfx_pistol,
-    sfx_shotgn,
-    sfx_sgcock,
-    sfx_dshtgn,
-    sfx_dbopn,
-    sfx_dbcls,
-    sfx_dbload,
-    sfx_plasma,
-    sfx_bfg,
-    sfx_sawup,
-    sfx_sawidl,
-    sfx_sawful,
-    sfx_sawhit,
-    sfx_rlaunc,
-    sfx_rxplod,
-    sfx_firsht,
-    sfx_firxpl,
-    sfx_pstart,
-    sfx_pstop,
-    sfx_doropn,
-    sfx_dorcls,
-    sfx_stnmov,
-    sfx_swtchn,
-    sfx_swtchx,
-    sfx_plpain,
-    sfx_dmpain,
-    sfx_popain,
-    sfx_vipain,
-    sfx_mnpain,
-    sfx_pepain,
-    sfx_slop,
-    sfx_itemup,
+    sfx_swish,
+    sfx_meatht,
+    sfx_mtalht,
     sfx_wpnup,
-    sfx_oof,
-    sfx_telept,
-    sfx_posit1,
-    sfx_posit2,
-    sfx_posit3,
-    sfx_bgsit1,
-    sfx_bgsit2,
-    sfx_sgtsit,
-    sfx_cacsit,
-    sfx_brssit,
-    sfx_cybsit,
-    sfx_spisit,
-    sfx_bspsit,
-    sfx_kntsit,
-    sfx_vilsit,
-    sfx_mansit,
-    sfx_pesit,
-    sfx_sklatk,
-    sfx_sgtatk,
-    sfx_skepch,
-    sfx_vilatk,
-    sfx_claw,
-    sfx_skeswg,
-    sfx_pldeth,
-    sfx_pdiehi,
-    sfx_podth1,
-    sfx_podth2,
-    sfx_podth3,
-    sfx_bgdth1,
-    sfx_bgdth2,
-    sfx_sgtdth,
-    sfx_cacdth,
-    sfx_skldth,
-    sfx_brsdth,
-    sfx_cybdth,
-    sfx_spidth,
-    sfx_bspdth,
-    sfx_vildth,
-    sfx_kntdth,
-    sfx_pedth,
-    sfx_skedth,
-    sfx_posact,
-    sfx_bgact,
-    sfx_dmact,
-    sfx_bspact,
-    sfx_bspwlk,
-    sfx_vilact,
-    sfx_noway,
+    sfx_rifle,
+    sfx_mislht,
     sfx_barexp,
-    sfx_punch,
-    sfx_hoof,
-    sfx_metal,
-    sfx_chgun,
-    sfx_tink,
+    sfx_flburn,
+    sfx_flidl,
+    sfx_agrsee,
+    sfx_plpain,
+    sfx_pcrush,
+    sfx_pespna,
+    sfx_pespnb,
+    sfx_pespnc,
+    sfx_pespnd,
+    sfx_agrdpn,
+    sfx_pldeth,
+    sfx_plxdth,
+    sfx_slop,
+    sfx_rebdth,
+    sfx_agrdth,
+    sfx_lgfire,
+    sfx_smfire,
+    sfx_alarm,
+    sfx_drlmto,
+    sfx_drlmtc,
+    sfx_drsmto,
+    sfx_drsmtc,
+    sfx_drlwud,
+    sfx_drswud,
+    sfx_drston,
     sfx_bdopn,
     sfx_bdcls,
+    sfx_swtchn,
+    sfx_swbolt,
+    sfx_swscan,
+    sfx_yeah,
+    sfx_mask,
+    sfx_pstart,
+    sfx_pstop,
+    sfx_itemup,
+    sfx_bglass,
+    sfx_wriver,
+    sfx_wfall,
+    sfx_wdrip,
+    sfx_wsplsh,
+    sfx_rebact,
+    sfx_agrac1,
+    sfx_agrac2,
+    sfx_agrac3,
+    sfx_agrac4,
+    sfx_ambppl,
+    sfx_ambbar,
+    sfx_telept,
+    sfx_ratact,
     sfx_itmbk,
-    sfx_flame,
-    sfx_flamst,
-    sfx_getpow,
-    sfx_bospit,
-    sfx_boscub,
-    sfx_bossit,
-    sfx_bospn,
-    sfx_bosdth,
-    sfx_manatk,
-    sfx_mandth,
-    sfx_sssit,
-    sfx_ssdth,
-    sfx_keenpn,
-    sfx_keendt,
-    sfx_skeact,
-    sfx_skesit,
-    sfx_skeatk,
+    sfx_xbow,
+    sfx_burnme,
+    sfx_oof,
+    sfx_wbrldt,
+    sfx_psdtha,
+    sfx_psdthb,
+    sfx_psdthc,
+    sfx_rb2pn,
+    sfx_rb2dth,
+    sfx_rb2see,
+    sfx_rb2act,
+    sfx_firxpl,
+    sfx_stnmov,
+    sfx_noway,
+    sfx_rlaunc,
+    sfx_rflite,
     sfx_radio,
+    sfx_pulchn,
+    sfx_swknob,
+    sfx_keycrd,
+    sfx_swston,
+    sfx_sntsee,
+    sfx_sntdth,
+    sfx_sntact,
+    sfx_pgrdat,
+    sfx_pgrsee,
+    sfx_pgrdpn,
+    sfx_pgrdth,
+    sfx_pgract,
+    sfx_proton,
+    sfx_protfl,
+    sfx_plasma,
+    sfx_dsrptr,
+    sfx_reavat,
+    sfx_revbld,
+    sfx_revsee,
+    sfx_reavpn,
+    sfx_revdth,
+    sfx_revact,
+    sfx_spisit,
+    sfx_spdwlk,
+    sfx_spidth,
+    sfx_spdatk,
+    sfx_chant,
+    sfx_static,
+    sfx_chain,
+    sfx_tend,
+    sfx_phoot,
+    sfx_explod,
+    sfx_sigil,
+    sfx_sglhit,
+    sfx_siglup,
+    sfx_prgpn,
+    sfx_progac,
+    sfx_lorpn,
+    sfx_lorsee,
+    sfx_difool,
+    sfx_inqdth,
+    sfx_inqact,
+    sfx_inqsee,
+    sfx_inqjmp,
+    sfx_amaln1,
+    sfx_amaln2,
+    sfx_amaln3,
+    sfx_amaln4,
+    sfx_amaln5,
+    sfx_amaln6,
+    sfx_mnalse,
+    sfx_alnsee,
+    sfx_alnpn,
+    sfx_alnact,
+    sfx_alndth,
+    sfx_mnaldt,
+    sfx_reactr,
+    sfx_airlck,
+    sfx_drchno,
+    sfx_drchnc,
+    sfx_valve,
     NUMSFX
 } sfxenum_t;