* ACTUALLY fix waiting for players chat.

* Correct minor bug with blink cursor on IP in multiplayer menu.
This commit is contained in:
toaster 2018-07-04 00:58:32 +01:00
parent 81f9657f31
commit fa2aa98e04
4 changed files with 5 additions and 3 deletions

View File

@ -1625,6 +1625,6 @@ void CON_Drawer(void)
if (con_curlines > 0) if (con_curlines > 0)
CON_DrawConsole(); 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_VOTING) || gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS)
CON_DrawHudlines(); CON_DrawHudlines();
} }

View File

@ -369,6 +369,7 @@ static void D_Display(void)
case GS_EVALUATION: case GS_EVALUATION:
F_GameEvaluationDrawer(); F_GameEvaluationDrawer();
HU_Erase();
HU_Drawer(); HU_Drawer();
break; break;
@ -390,6 +391,7 @@ static void D_Display(void)
// The clientconnect drawer is independent... // The clientconnect drawer is independent...
// I don't think HOM from nothing drawing is independent... // I don't think HOM from nothing drawing is independent...
F_WaitingPlayersDrawer(); F_WaitingPlayersDrawer();
HU_Erase();
HU_Drawer(); HU_Drawer();
case GS_DEDICATEDSERVER: case GS_DEDICATEDSERVER:
case GS_NULL: case GS_NULL:

View File

@ -1180,7 +1180,7 @@ void HU_Drawer(void)
|| gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE
|| gamestate == GS_CREDITS || gamestate == GS_EVALUATION || gamestate == GS_CREDITS || gamestate == GS_EVALUATION
|| gamestate == GS_GAMEEND || gamestate == GS_GAMEEND
|| gamestate == GS_VOTING) // SRB2kart || gamestate == GS_VOTING || gamestate == GS_WAITINGPLAYERS) // SRB2kart
return; return;
// draw multiplayer rankings // draw multiplayer rankings

View File

@ -6960,7 +6960,7 @@ Update the maxplayers label...
V_DrawString(x+8,y+12, V_MONOSPACE, setupm_ip); V_DrawString(x+8,y+12, V_MONOSPACE, setupm_ip);
// draw text cursor for name // draw text cursor for name
if (itemOn == 5 //0 if (itemOn == 7
&& skullAnimCounter < 4) //blink cursor && skullAnimCounter < 4) //blink cursor
V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_MONOSPACE),y+12,'_',false); V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_MONOSPACE),y+12,'_',false);
#endif #endif