diff options
Diffstat (limited to 'src/doom')
| -rw-r--r-- | src/doom/deh_sound.c | 2 | ||||
| -rw-r--r-- | src/doom/s_sound.c | 2 | ||||
| -rw-r--r-- | src/doom/sounds.c | 219 |
3 files changed, 112 insertions, 111 deletions
diff --git a/src/doom/deh_sound.c b/src/doom/deh_sound.c index b28154d9..9d904aa2 100644 --- a/src/doom/deh_sound.c +++ b/src/doom/deh_sound.c @@ -36,7 +36,7 @@ DEH_BEGIN_MAPPING(sound_mapping, sfxinfo_t) DEH_UNSUPPORTED_MAPPING("Offset") - DEH_MAPPING("Zero/One", singularity) + DEH_UNSUPPORTED_MAPPING("Zero/One") DEH_MAPPING("Value", priority) DEH_MAPPING("Zero 1", link) DEH_MAPPING("Zero 2", pitch) diff --git a/src/doom/s_sound.c b/src/doom/s_sound.c index e78f763a..19d76a6b 100644 --- a/src/doom/s_sound.c +++ b/src/doom/s_sound.c @@ -125,6 +125,8 @@ void S_Init(int sfxVolume, int musicVolume) I_InitSound(); I_InitMusic(); + I_PrecacheSounds(S_sfx, NUMSFX); + S_SetSfxVolume(sfxVolume); S_SetMusicVolume(musicVolume); diff --git a/src/doom/sounds.c b/src/doom/sounds.c index 6f315023..37f3e404 100644 --- a/src/doom/sounds.c +++ b/src/doom/sounds.c @@ -116,115 +116,114 @@ musicinfo_t S_music[] = sfxinfo_t S_sfx[] = { // S_sfx[0] needs to be a dummy for odd reasons. - { "none", false, 0, 0, -1, -1, 0, 0, 0 }, - - { "pistol", false, 64, 0, -1, -1, 0, 0, 0 }, - { "shotgn", false, 64, 0, -1, -1, 0, 0, 0 }, - { "sgcock", false, 64, 0, -1, -1, 0, 0, 0 }, - { "dshtgn", false, 64, 0, -1, -1, 0, 0, 0 }, - { "dbopn", false, 64, 0, -1, -1, 0, 0, 0 }, - { "dbcls", false, 64, 0, -1, -1, 0, 0, 0 }, - { "dbload", false, 64, 0, -1, -1, 0, 0, 0 }, - { "plasma", false, 64, 0, -1, -1, 0, 0, 0 }, - { "bfg", false, 64, 0, -1, -1, 0, 0, 0 }, - { "sawup", false, 64, 0, -1, -1, 0, 0, 0 }, - { "sawidl", false, 118, 0, -1, -1, 0, 0, 0 }, - { "sawful", false, 64, 0, -1, -1, 0, 0, 0 }, - { "sawhit", false, 64, 0, -1, -1, 0, 0, 0 }, - { "rlaunc", false, 64, 0, -1, -1, 0, 0, 0 }, - { "rxplod", false, 70, 0, -1, -1, 0, 0, 0 }, - { "firsht", false, 70, 0, -1, -1, 0, 0, 0 }, - { "firxpl", false, 70, 0, -1, -1, 0, 0, 0 }, - { "pstart", false, 100, 0, -1, -1, 0, 0, 0 }, - { "pstop", false, 100, 0, -1, -1, 0, 0, 0 }, - { "doropn", false, 100, 0, -1, -1, 0, 0, 0 }, - { "dorcls", false, 100, 0, -1, -1, 0, 0, 0 }, - { "stnmov", false, 119, 0, -1, -1, 0, 0, 0 }, - { "swtchn", false, 78, 0, -1, -1, 0, 0, 0 }, - { "swtchx", false, 78, 0, -1, -1, 0, 0, 0 }, - { "plpain", false, 96, 0, -1, -1, 0, 0, 0 }, - { "dmpain", false, 96, 0, -1, -1, 0, 0, 0 }, - { "popain", false, 96, 0, -1, -1, 0, 0, 0 }, - { "vipain", false, 96, 0, -1, -1, 0, 0, 0 }, - { "mnpain", false, 96, 0, -1, -1, 0, 0, 0 }, - { "pepain", false, 96, 0, -1, -1, 0, 0, 0 }, - { "slop", false, 78, 0, -1, -1, 0, 0, 0 }, - { "itemup", true, 78, 0, -1, -1, 0, 0, 0 }, - { "wpnup", true, 78, 0, -1, -1, 0, 0, 0 }, - { "oof", false, 96, 0, -1, -1, 0, 0, 0 }, - { "telept", false, 32, 0, -1, -1, 0, 0, 0 }, - { "posit1", true, 98, 0, -1, -1, 0, 0, 0 }, - { "posit2", true, 98, 0, -1, -1, 0, 0, 0 }, - { "posit3", true, 98, 0, -1, -1, 0, 0, 0 }, - { "bgsit1", true, 98, 0, -1, -1, 0, 0, 0 }, - { "bgsit2", true, 98, 0, -1, -1, 0, 0, 0 }, - { "sgtsit", true, 98, 0, -1, -1, 0, 0, 0 }, - { "cacsit", true, 98, 0, -1, -1, 0, 0, 0 }, - { "brssit", true, 94, 0, -1, -1, 0, 0, 0 }, - { "cybsit", true, 92, 0, -1, -1, 0, 0, 0 }, - { "spisit", true, 90, 0, -1, -1, 0, 0, 0 }, - { "bspsit", true, 90, 0, -1, -1, 0, 0, 0 }, - { "kntsit", true, 90, 0, -1, -1, 0, 0, 0 }, - { "vilsit", true, 90, 0, -1, -1, 0, 0, 0 }, - { "mansit", true, 90, 0, -1, -1, 0, 0, 0 }, - { "pesit", true, 90, 0, -1, -1, 0, 0, 0 }, - { "sklatk", false, 70, 0, -1, -1, 0, 0, 0 }, - { "sgtatk", false, 70, 0, -1, -1, 0, 0, 0 }, - { "skepch", false, 70, 0, -1, -1, 0, 0, 0 }, - { "vilatk", false, 70, 0, -1, -1, 0, 0, 0 }, - { "claw", false, 70, 0, -1, -1, 0, 0, 0 }, - { "skeswg", false, 70, 0, -1, -1, 0, 0, 0 }, - { "pldeth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "pdiehi", false, 32, 0, -1, -1, 0, 0, 0 }, - { "podth1", false, 70, 0, -1, -1, 0, 0, 0 }, - { "podth2", false, 70, 0, -1, -1, 0, 0, 0 }, - { "podth3", false, 70, 0, -1, -1, 0, 0, 0 }, - { "bgdth1", false, 70, 0, -1, -1, 0, 0, 0 }, - { "bgdth2", false, 70, 0, -1, -1, 0, 0, 0 }, - { "sgtdth", false, 70, 0, -1, -1, 0, 0, 0 }, - { "cacdth", false, 70, 0, -1, -1, 0, 0, 0 }, - { "skldth", false, 70, 0, -1, -1, 0, 0, 0 }, - { "brsdth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "cybdth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "spidth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "bspdth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "vildth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "kntdth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "pedth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "skedth", false, 32, 0, -1, -1, 0, 0, 0 }, - { "posact", true, 120, 0, -1, -1, 0, 0, 0 }, - { "bgact", true, 120, 0, -1, -1, 0, 0, 0 }, - { "dmact", true, 120, 0, -1, -1, 0, 0, 0 }, - { "bspact", true, 100, 0, -1, -1, 0, 0, 0 }, - { "bspwlk", true, 100, 0, -1, -1, 0, 0, 0 }, - { "vilact", true, 100, 0, -1, -1, 0, 0, 0 }, - { "noway", false, 78, 0, -1, -1, 0, 0, 0 }, - { "barexp", false, 60, 0, -1, -1, 0, 0, 0 }, - { "punch", false, 64, 0, -1, -1, 0, 0, 0 }, - { "hoof", false, 70, 0, -1, -1, 0, 0, 0 }, - { "metal", false, 70, 0, -1, -1, 0, 0, 0 }, - { "chgun", false, 64, &S_sfx[sfx_pistol], 150, 0, 0, 0, 0 }, - { "tink", false, 60, 0, -1, -1, 0, 0, 0 }, - { "bdopn", false, 100, 0, -1, -1, 0, 0, 0 }, - { "bdcls", false, 100, 0, -1, -1, 0, 0, 0 }, - { "itmbk", false, 100, 0, -1, -1, 0, 0, 0 }, - { "flame", false, 32, 0, -1, -1, 0, 0, 0 }, - { "flamst", false, 32, 0, -1, -1, 0, 0, 0 }, - { "getpow", false, 60, 0, -1, -1, 0, 0, 0 }, - { "bospit", false, 70, 0, -1, -1, 0, 0, 0 }, - { "boscub", false, 70, 0, -1, -1, 0, 0, 0 }, - { "bossit", false, 70, 0, -1, -1, 0, 0, 0 }, - { "bospn", false, 70, 0, -1, -1, 0, 0, 0 }, - { "bosdth", false, 70, 0, -1, -1, 0, 0, 0 }, - { "manatk", false, 70, 0, -1, -1, 0, 0, 0 }, - { "mandth", false, 70, 0, -1, -1, 0, 0, 0 }, - { "sssit", false, 70, 0, -1, -1, 0, 0, 0 }, - { "ssdth", false, 70, 0, -1, -1, 0, 0, 0 }, - { "keenpn", false, 70, 0, -1, -1, 0, 0, 0 }, - { "keendt", false, 70, 0, -1, -1, 0, 0, 0 }, - { "skeact", false, 70, 0, -1, -1, 0, 0, 0 }, - { "skesit", false, 70, 0, -1, -1, 0, 0, 0 }, - { "skeatk", false, 70, 0, -1, -1, 0, 0, 0 }, - { "radio", false, 60, 0, -1, -1, 0, 0, 0 } + { "none", 0, 0, -1, -1, 0, 0, 0, NULL }, + { "pistol", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "shotgn", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "sgcock", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "dshtgn", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "dbopn", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "dbcls", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "dbload", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "plasma", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "bfg", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "sawup", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "sawidl", 118, 0, -1, -1, 0, 0, 0, NULL }, + { "sawful", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "sawhit", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "rlaunc", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "rxplod", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "firsht", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "firxpl", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "pstart", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "pstop", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "doropn", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "dorcls", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "stnmov", 119, 0, -1, -1, 0, 0, 0, NULL }, + { "swtchn", 78, 0, -1, -1, 0, 0, 0, NULL }, + { "swtchx", 78, 0, -1, -1, 0, 0, 0, NULL }, + { "plpain", 96, 0, -1, -1, 0, 0, 0, NULL }, + { "dmpain", 96, 0, -1, -1, 0, 0, 0, NULL }, + { "popain", 96, 0, -1, -1, 0, 0, 0, NULL }, + { "vipain", 96, 0, -1, -1, 0, 0, 0, NULL }, + { "mnpain", 96, 0, -1, -1, 0, 0, 0, NULL }, + { "pepain", 96, 0, -1, -1, 0, 0, 0, NULL }, + { "slop", 78, 0, -1, -1, 0, 0, 0, NULL }, + { "itemup", 78, 0, -1, -1, 0, 0, 0, NULL }, + { "wpnup", 78, 0, -1, -1, 0, 0, 0, NULL }, + { "oof", 96, 0, -1, -1, 0, 0, 0, NULL }, + { "telept", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "posit1", 98, 0, -1, -1, 0, 0, 0, NULL }, + { "posit2", 98, 0, -1, -1, 0, 0, 0, NULL }, + { "posit3", 98, 0, -1, -1, 0, 0, 0, NULL }, + { "bgsit1", 98, 0, -1, -1, 0, 0, 0, NULL }, + { "bgsit2", 98, 0, -1, -1, 0, 0, 0, NULL }, + { "sgtsit", 98, 0, -1, -1, 0, 0, 0, NULL }, + { "cacsit", 98, 0, -1, -1, 0, 0, 0, NULL }, + { "brssit", 94, 0, -1, -1, 0, 0, 0, NULL }, + { "cybsit", 92, 0, -1, -1, 0, 0, 0, NULL }, + { "spisit", 90, 0, -1, -1, 0, 0, 0, NULL }, + { "bspsit", 90, 0, -1, -1, 0, 0, 0, NULL }, + { "kntsit", 90, 0, -1, -1, 0, 0, 0, NULL }, + { "vilsit", 90, 0, -1, -1, 0, 0, 0, NULL }, + { "mansit", 90, 0, -1, -1, 0, 0, 0, NULL }, + { "pesit", 90, 0, -1, -1, 0, 0, 0, NULL }, + { "sklatk", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "sgtatk", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "skepch", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "vilatk", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "claw", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "skeswg", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "pldeth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "pdiehi", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "podth1", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "podth2", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "podth3", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "bgdth1", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "bgdth2", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "sgtdth", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "cacdth", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "skldth", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "brsdth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "cybdth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "spidth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "bspdth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "vildth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "kntdth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "pedth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "skedth", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "posact", 120, 0, -1, -1, 0, 0, 0, NULL }, + { "bgact", 120, 0, -1, -1, 0, 0, 0, NULL }, + { "dmact", 120, 0, -1, -1, 0, 0, 0, NULL }, + { "bspact", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "bspwlk", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "vilact", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "noway", 78, 0, -1, -1, 0, 0, 0, NULL }, + { "barexp", 60, 0, -1, -1, 0, 0, 0, NULL }, + { "punch", 64, 0, -1, -1, 0, 0, 0, NULL }, + { "hoof", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "metal", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "chgun", 64, &S_sfx[sfx_pistol], 150, 0, 0, 0, 0, NULL }, + { "tink", 60, 0, -1, -1, 0, 0, 0, NULL }, + { "bdopn", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "bdcls", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "itmbk", 100, 0, -1, -1, 0, 0, 0, NULL }, + { "flame", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "flamst", 32, 0, -1, -1, 0, 0, 0, NULL }, + { "getpow", 60, 0, -1, -1, 0, 0, 0, NULL }, + { "bospit", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "boscub", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "bossit", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "bospn", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "bosdth", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "manatk", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "mandth", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "sssit", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "ssdth", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "keenpn", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "keendt", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "skeact", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "skesit", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "skeatk", 70, 0, -1, -1, 0, 0, 0, NULL }, + { "radio", 60, 0, -1, -1, 0, 0, 0, NULL } }; |