- Gave the intermission screen sounds their own SNDINFO entries.
SVN r1551 (trunk)
This commit is contained in:
Randy Heit
parent
e865d95070
commit
1954f9ee84
3 changed files with 74 additions and 48 deletions
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue