From 5bd71970adc754528e128b9769331a5fed84afe2 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Fri, 15 Sep 2017 20:34:46 +0100
Subject: [PATCH] Make chat visible in the evaluation gamestate.
---
src/console.c | 4 +++-
src/d_main.c | 1 +
src/g_game.c | 8 +++-----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/console.c b/src/console.c
index 54fde7af72..fe865abe69 100644
--- a/src/console.c
+++ b/src/console.c
@@ -1632,6 +1632,8 @@ void CON_Drawer(void)
if (con_curlines > 0)
CON_DrawConsole();
- else if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS)
+ else if (gamestate == GS_LEVEL
+ || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE
+ || gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
CON_DrawHudlines();
}
diff --git a/src/d_main.c b/src/d_main.c
index 7a8a85f255..ff9dd22c2e 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -352,6 +352,7 @@ static void D_Display(void)
case GS_EVALUATION:
F_GameEvaluationDrawer();
+ HU_Erase();
HU_Drawer();
break;
diff --git a/src/g_game.c b/src/g_game.c
index cbf340a1dc..0c42a95878 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1798,7 +1798,6 @@ boolean G_Responder(event_t *ev)
return true;
}
}
-
else if (gamestate == GS_CREDITS)
{
if (HU_Responder(ev))
@@ -1810,17 +1809,15 @@ boolean G_Responder(event_t *ev)
return true;
}
}
-
else if (gamestate == GS_CONTINUING)
{
if (F_ContinueResponder(ev))
return true;
}
// Demo End
- else if (gamestate == GS_GAMEEND || gamestate == GS_EVALUATION || gamestate == GS_CREDITS)
+ else if (gamestate == GS_GAMEEND)
return true;
-
- else if (gamestate == GS_INTERMISSION)
+ else if (gamestate == GS_INTERMISSION || gamestate == GS_EVALUATION)
if (HU_Responder(ev))
return true; // chat ate the event
@@ -1977,6 +1974,7 @@ void G_Ticker(boolean run)
case GS_EVALUATION:
if (run)
F_GameEvaluationTicker();
+ HU_Ticker();
break;
case GS_CONTINUING:
--
GitLab