zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 12:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Setting intermissioncounter to false in gameinfo drew all the stats

Browse source 
at once, instead of revealing them one line at a time.


SVN r1704 (trunk)
This commit is contained in:
Randy Heit 2009-07-04 01:26:57 +00:00
parent 29b1864da0
commit 201c5c5125
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/rh-log.txt
View file

@ -1,4 +1,6 @@
July 3, 2009 July 3, 2009
- Fixed: Setting intermissioncounter to false in gameinfo drew all the stats
at once, instead of revealing them one line at a time.
- Fixed: The border definition in MAPINFO's gameinfo block used extra braces. - Fixed: The border definition in MAPINFO's gameinfo block used extra braces.
June 30, 2009 June 30, 2009

14
src/wi_stuff.cpp
View file

@ -1648,7 +1648,7 @@ void WI_updateStats ()
{ {
WI_updateAnimatedBack (); WI_updateAnimatedBack ();
if ((!gameinfo.intermissioncounter || acceleratestage) && sp_state != 10) if (acceleratestage && sp_state != 10)
{ {
if (acceleratestage) if (acceleratestage)
{ {
@ -1673,7 +1673,7 @@ void WI_updateStats ()
if (!(bcnt&3)) if (!(bcnt&3))
S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE);
} }
if (cnt_kills[0] >= plrs[me].skills) if (!gameinfo.intermissioncounter || cnt_kills[0] >= plrs[me].skills)
{ {
cnt_kills[0] = plrs[me].skills; cnt_kills[0] = plrs[me].skills;
S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE);
@ -1689,7 +1689,7 @@ void WI_updateStats ()
if (!(bcnt&3)) if (!(bcnt&3))
S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE);
} }
if (cnt_items[0] >= plrs[me].sitems) if (!gameinfo.intermissioncounter || cnt_items[0] >= plrs[me].sitems)
{ {
cnt_items[0] = plrs[me].sitems; cnt_items[0] = plrs[me].sitems;
S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE);
@ -1705,7 +1705,7 @@ void WI_updateStats ()
if (!(bcnt&3)) if (!(bcnt&3))
S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE); S_Sound (CHAN_VOICE | CHAN_UI, "intermission/tick", 1, ATTN_NONE);
} }
if (cnt_secret[0] >= plrs[me].ssecret) if (!gameinfo.intermissioncounter || cnt_secret[0] >= plrs[me].ssecret)
{ {
cnt_secret[0] = plrs[me].ssecret; cnt_secret[0] = plrs[me].ssecret;
S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE); S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE);
@ -1724,13 +1724,13 @@ void WI_updateStats ()
cnt_total_time += 3; cnt_total_time += 3;
} }
if (cnt_time >= plrs[me].stime / TICRATE) if (!gameinfo.intermissioncounter || cnt_time >= plrs[me].stime / TICRATE)
cnt_time = plrs[me].stime / TICRATE; cnt_time = plrs[me].stime / TICRATE;
if (cnt_total_time >= wbs->totaltime / TICRATE) if (!gameinfo.intermissioncounter || cnt_total_time >= wbs->totaltime / TICRATE)
cnt_total_time = wbs->totaltime / TICRATE; cnt_total_time = wbs->totaltime / TICRATE;
if (cnt_par >= wbs->partime / TICRATE) if (!gameinfo.intermissioncounter || cnt_par >= wbs->partime / TICRATE)
{ {
cnt_par = wbs->partime / TICRATE; cnt_par = wbs->partime / TICRATE;