From 81f9657f31393f141f13cba0c21470aef8fc3cde Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 3 Jul 2018 22:30:22 +0100 Subject: [PATCH 1/2] Chat messages in the waiting for players screen! --- src/d_main.c | 1 + src/g_game.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index 241659ec..78c4fca6 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -390,6 +390,7 @@ static void D_Display(void) // The clientconnect drawer is independent... // I don't think HOM from nothing drawing is independent... F_WaitingPlayersDrawer(); + HU_Drawer(); case GS_DEDICATEDSERVER: case GS_NULL: break; diff --git a/src/g_game.c b/src/g_game.c index 1f517328..fde18281 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1905,7 +1905,7 @@ boolean G_Responder(event_t *ev) else if (gamestate == GS_GAMEEND || gamestate == GS_EVALUATION || gamestate == GS_CREDITS) return true; - else if (gamestate == GS_INTERMISSION || gamestate == GS_VOTING) + else if (gamestate == GS_INTERMISSION || gamestate == GS_VOTING || gamestate == GS_WAITINGPLAYERS) if (HU_Responder(ev)) return true; // chat ate the event @@ -2162,6 +2162,7 @@ void G_Ticker(boolean run) break; case GS_WAITINGPLAYERS: F_WaitingPlayersTicker(); + HU_Ticker(); break; case GS_DEDICATEDSERVER: From fa2aa98e04621a3fb99634dbe8ff16444f4345e3 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 4 Jul 2018 00:58:32 +0100 Subject: [PATCH 2/2] * ACTUALLY fix waiting for players chat. * Correct minor bug with blink cursor on IP in multiplayer menu. --- src/console.c | 2 +- src/d_main.c | 2 ++ src/hu_stuff.c | 2 +- src/m_menu.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/console.c b/src/console.c index 7faf954d..43d5df2d 100644 --- a/src/console.c +++ b/src/console.c @@ -1625,6 +1625,6 @@ void CON_Drawer(void) if (con_curlines > 0) CON_DrawConsole(); else if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS - || gamestate == GS_VOTING) + || gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS) CON_DrawHudlines(); } diff --git a/src/d_main.c b/src/d_main.c index 78c4fca6..15e11b0d 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -369,6 +369,7 @@ static void D_Display(void) case GS_EVALUATION: F_GameEvaluationDrawer(); + HU_Erase(); HU_Drawer(); break; @@ -390,6 +391,7 @@ static void D_Display(void) // The clientconnect drawer is independent... // I don't think HOM from nothing drawing is independent... F_WaitingPlayersDrawer(); + HU_Erase(); HU_Drawer(); case GS_DEDICATEDSERVER: case GS_NULL: diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 63d75c76..6288c629 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -1180,7 +1180,7 @@ void HU_Drawer(void) || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS || gamestate == GS_EVALUATION || gamestate == GS_GAMEEND - || gamestate == GS_VOTING) // SRB2kart + || gamestate == GS_VOTING || gamestate == GS_WAITINGPLAYERS) // SRB2kart return; // draw multiplayer rankings diff --git a/src/m_menu.c b/src/m_menu.c index c8e7fae8..0000fa55 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6960,7 +6960,7 @@ Update the maxplayers label... V_DrawString(x+8,y+12, V_MONOSPACE, setupm_ip); // draw text cursor for name - if (itemOn == 5 //0 + if (itemOn == 7 && skullAnimCounter < 4) //blink cursor V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_MONOSPACE),y+12,'_',false); #endif