From 201c5c51258d2aa92be1661467396a2a34061a75 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sat, 4 Jul 2009 01:26:57 +0000
Subject: [PATCH] - Fixed: Setting intermissioncounter to false in gameinfo
 drew all the stats   at once, instead of revealing them one line at a time.

SVN r1704 (trunk)
---
 docs/rh-log.txt  |  2 ++
 src/wi_stuff.cpp | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index f28f20dd48..5a7ba11635 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 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.
 
 June 30, 2009
diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp
index 20cd4bc492..ca7b11e378 100644
--- a/src/wi_stuff.cpp
+++ b/src/wi_stuff.cpp
@@ -1648,7 +1648,7 @@ void WI_updateStats ()
 {
 	WI_updateAnimatedBack ();
 
-	if ((!gameinfo.intermissioncounter || acceleratestage) && sp_state != 10)
+	if (acceleratestage && sp_state != 10)
 	{
 		if (acceleratestage)
 		{
@@ -1673,7 +1673,7 @@ void WI_updateStats ()
 			if (!(bcnt&3))
 				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;
 			S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE);
@@ -1689,7 +1689,7 @@ void WI_updateStats ()
 			if (!(bcnt&3))
 				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;
 			S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE);
@@ -1705,7 +1705,7 @@ void WI_updateStats ()
 			if (!(bcnt&3))
 				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;
 			S_Sound (CHAN_VOICE | CHAN_UI, "intermission/nextstage", 1, ATTN_NONE);
@@ -1724,13 +1724,13 @@ void WI_updateStats ()
 			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;
 
-		if (cnt_total_time >= wbs->totaltime / TICRATE)
+		if (!gameinfo.intermissioncounter || 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;