From 1954f9ee840c7497c59d64c1bbd8f6e61cdc9a6a Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sat, 18 Apr 2009 01:31:08 +0000 Subject: [PATCH] - Gave the intermission screen sounds their own SNDINFO entries. SVN r1551 (trunk) --- docs/rh-log.txt | 5 ++- src/wi_stuff.cpp | 51 ++++++++++++++---------------- wadsrc/static/sndinfo.txt | 66 +++++++++++++++++++++++++++------------ 3 files changed, 74 insertions(+), 48 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 5197fe1c88..78e4baefcd 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,7 @@ -April 16, 2009 +April 17, 2009 +- Gave the intermission screen sounds their own SNDINFO entries. + +April 16, 2009 - Removed obsolete snd_surround cvar. April 15, 2009 diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp index 777e1328a1..14dd53f506 100644 --- a/src/wi_stuff.cpp +++ b/src/wi_stuff.cpp @@ -65,9 +65,6 @@ CVAR (Bool, wi_noautostartmap, false, CVAR_ARCHIVE) void WI_loadData (); void WI_unloadData (); -#define NEXTSTAGE (gameinfo.gametype & GAME_DoomChex ? "weapons/rocklx" : "doors/dr1_clos") -#define PASTSTATS (gameinfo.gametype & GAME_DoomChex ? "weapons/shotgr" : "plats/pt1_stop") - // GLOBAL LOCATIONS #define WI_TITLEY 2 #define WI_SPACINGY 33 @@ -1185,7 +1182,7 @@ void WI_updateDeathmatchStats () } } - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); */ dm_state = 4; } @@ -1195,7 +1192,7 @@ void WI_updateDeathmatchStats () { /* if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); stillticking = false; @@ -1234,7 +1231,7 @@ void WI_updateDeathmatchStats () } if (!stillticking) { - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); dm_state++; } */ @@ -1244,7 +1241,7 @@ void WI_updateDeathmatchStats () { if (acceleratestage) { - S_Sound (CHAN_VOICE | CHAN_UI, "players/male/gibbed", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/pastdmstats", 1, ATTN_NONE); WI_initShowNextLoc(); } } @@ -1402,14 +1399,14 @@ void WI_updateNetgameStats () if (dofrags) cnt_frags[i] = WI_fragSum (i); } - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); ng_state = 10; } if (ng_state == 2) { if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); stillticking = false; @@ -1428,14 +1425,14 @@ void WI_updateNetgameStats () if (!stillticking) { - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); ng_state++; } } else if (ng_state == 4) { if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); stillticking = false; @@ -1452,14 +1449,14 @@ void WI_updateNetgameStats () } if (!stillticking) { - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); ng_state++; } } else if (ng_state == 6) { if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); stillticking = false; @@ -1478,14 +1475,14 @@ void WI_updateNetgameStats () if (!stillticking) { - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); ng_state += 1 + 2*!dofrags; } } else if (ng_state == 8) { if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); stillticking = false; @@ -1504,7 +1501,7 @@ void WI_updateNetgameStats () if (!stillticking) { - S_Sound (CHAN_VOICE | CHAN_UI, "player/male/death1", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/cooptotal", 1, ATTN_NONE); ng_state++; } } @@ -1512,7 +1509,7 @@ void WI_updateNetgameStats () { if (acceleratestage) { - S_Sound (CHAN_VOICE | CHAN_UI, PASTSTATS, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/pastcoopstats", 1, ATTN_NONE); WI_initShowNextLoc(); } } @@ -1658,7 +1655,7 @@ void WI_updateStats () { acceleratestage = 0; sp_state = 10; - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); } cnt_kills[0] = plrs[me].skills; cnt_items[0] = plrs[me].sitems; @@ -1675,12 +1672,12 @@ void WI_updateStats () cnt_kills[0] += 2; if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); } if (cnt_kills[0] >= plrs[me].skills) { cnt_kills[0] = plrs[me].skills; - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); sp_state++; } } @@ -1691,12 +1688,12 @@ void WI_updateStats () cnt_items[0] += 2; if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); } if (cnt_items[0] >= plrs[me].sitems) { cnt_items[0] = plrs[me].sitems; - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); sp_state++; } } @@ -1707,12 +1704,12 @@ void WI_updateStats () cnt_secret[0] += 2; if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); } if (cnt_secret[0] >= plrs[me].ssecret) { cnt_secret[0] = plrs[me].ssecret; - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); sp_state++; } } @@ -1721,7 +1718,7 @@ void WI_updateStats () if (gameinfo.gametype & GAME_DoomChex) { if (!(bcnt&3)) - S_Sound (CHAN_VOICE | CHAN_UI, "weapons/pistol", 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); cnt_time += 3; cnt_par += 3; @@ -1741,7 +1738,7 @@ void WI_updateStats () if (cnt_time >= plrs[me].stime / TICRATE) { cnt_total_time = wbs->totaltime / TICRATE; - S_Sound (CHAN_VOICE | CHAN_UI, NEXTSTAGE, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); sp_state++; } } @@ -1750,7 +1747,7 @@ void WI_updateStats () { if (acceleratestage) { - S_Sound (CHAN_VOICE | CHAN_UI, PASTSTATS, 1, ATTN_NONE); + S_Sound (CHAN_VOICE | CHAN_UI, "intermission/paststats", 1, ATTN_NONE); WI_initShowNextLoc(); } } diff --git a/wadsrc/static/sndinfo.txt b/wadsrc/static/sndinfo.txt index 9956593b06..8a67640433 100644 --- a/wadsrc/static/sndinfo.txt +++ b/wadsrc/static/sndinfo.txt @@ -50,11 +50,11 @@ misc/icebreak icebrk1a // Retail Doom and Strife use 200. $rolloff * 200 1200 -/***************************************************************************/ -/* */ -/* DOOM SOUNDS */ -/* */ -/***************************************************************************/ +/****************************************************************************/ +/* */ +/* DOOM SOUNDS */ +/* */ +/****************************************************************************/ $ifdoom @@ -495,16 +495,22 @@ menu/clear dsswtchx // Close top menu $random menu/quit1 { player/male/death1 demon/pain grunt/pain misc/gibbed misc/teleport grunt/sight1 grunt/sight3 demon/melee } $random menu/quit2 { vile/active misc/p_pkup brain/cube misc/gibbed skeleton/swing knight/death baby/active demon/melee } +$alias intermission/tick weapons/pistol +$alias intermission/cooptotal *death +$alias intermission/nextstage weapons/rocklx +$alias intermission/paststats weapons/shotgr +$alias intermission/pastcoopstats weapons/shotgr +$alias intermission/pastdmstats *gibbed $endif // ifdoom -/***************************************************************************/ -/* */ -/* HERETIC SOUNDS */ -/* */ -/***************************************************************************/ +/****************************************************************************/ +/* */ +/* HERETIC SOUNDS */ +/* */ +/****************************************************************************/ $ifheretic @@ -784,14 +790,21 @@ menu/clear dorcls misc/secret dssecret +$alias intermission/cooptotal *death +$alias intermission/nextstage doors/dr1_clos +$alias intermission/paststats plats/pt1_stop +$alias intermission/pastcoopstats plats/pt1_stop +$alias intermission/pastdmstats *gibbed + + $endif // ifheretic -/***************************************************************************/ -/* */ -/* HEXEN SOUNDS */ -/* */ -/***************************************************************************/ +/****************************************************************************/ +/* */ +/* HEXEN SOUNDS */ +/* */ +/****************************************************************************/ $ifhexen @@ -952,6 +965,12 @@ $alias menu/clear PlatformStop // Hexen does not have ripslop sound like Heretic misc/ripslop dsempty +$alias intermission/cooptotal *death +$alias intermission/nextstage DoorCloseLight +$alias intermission/paststats PlatformStop +$alias intermission/pastcoopstats PlatformStop +$alias intermission/pastdmstats *gibbed + $limit DoorCloseLight 4 $limit PuppyBeat 0 @@ -968,11 +987,11 @@ $limit DragonPain 0 $endif // ifhexen -//=========================================================================== -// -// Strife -// -//=========================================================================== +/****************************************************************************/ +/* */ +/* STRIFE SOUNDS */ +/* */ +/****************************************************************************/ $ifstrife @@ -1275,4 +1294,11 @@ entity/pain dsalnpn entity/death dsmnaldt entity/active dsalnact +$alias intermission/tick weapons/assaultgun +$alias intermission/cooptotal *death +$alias intermission/nextstage misc/explosion +$alias intermission/paststats world/barrelx +$alias intermission/pastcoopstats world/barrelx +$alias intermission/pastdmstats *gibbed + $endif