# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1607886653 18000
#      Sun Dec 13 14:10:53 2020 -0500
# Node ID 79a51679003d4dbe28767b7c63b9b7e6919d1edd
# Parent  355cec47d164c3765e17295de05703a0661044c2
Fixed the lagging scoreboard icon from appearing during the intermission screen. The icon is also drawn next to the chatting or "in console" icons rather than overriding them.

diff -r 355cec47d164 -r 79a51679003d src/scoreboard.cpp
--- a/src/scoreboard.cpp	Sun Dec 13 10:45:38 2020 -0500
+++ b/src/scoreboard.cpp	Sun Dec 13 14:10:53 2020 -0500
@@ -2351,12 +2351,9 @@
 
 				// Draw a chat icon if this player is chatting.
 				// [Cata] Also shows who's in the console.
-				// [AK] Also show an icon if the player is lagging to the server.
-				if (( players[ulPlayer].bChatting ) || ( players[ulPlayer].bInConsole ) || ( players[ulPlayer].bLagging ))
+				if (( players[ulPlayer].bChatting ) || ( players[ulPlayer].bInConsole ))
 				{
-					if ( players[ulPlayer].bLagging )
-						sprintf( szPatchName, "LAGMINI" );
-					else if ( players[ulPlayer].bInConsole )
+					if ( players[ulPlayer].bInConsole )
 						sprintf( szPatchName, "CONSMINI" );
 					else
 						sprintf( szPatchName, "TLKMINI" );
@@ -2383,6 +2380,33 @@
 					lXPosOffset -= 4;
 				}
 
+				// [AK] Also show an icon if the player is lagging to the server.
+				if (( players[ulPlayer].bLagging ) && ( gamestate == GS_LEVEL ))
+				{
+					sprintf( szPatchName, "LAGMINI" );
+
+					lXPosOffset -= TexMan[szPatchName]->GetWidth();
+					if ( g_bScale )
+					{
+						screen->DrawTexture( TexMan[szPatchName],
+							(LONG)( g_aulColumnX[ulIdx] * g_fXScale ) + lXPosOffset,
+							g_ulCurYPos - 1,
+							DTA_VirtualWidth, g_ValWidth.Int,
+							DTA_VirtualHeight, g_ValHeight.Int,
+							TAG_DONE );
+					}
+					else
+					{
+						screen->DrawTexture( TexMan[szPatchName],
+							(LONG)( g_aulColumnX[ulIdx] / 320.0f * SCREENWIDTH ) + lXPosOffset,
+							g_ulCurYPos - 1,
+							DTA_Clean,
+							g_bScale,
+							TAG_DONE );
+					}
+					lXPosOffset -= 4;
+				}
+
 				// Draw text if there's a vote on and this player voted.
 				if ( CALLVOTE_GetVoteState() == VOTESTATE_INVOTE )
 				{