# HG changeset patch # User Adam Kaminski # Date 1642324230 18000 # Sun Jan 16 04:10:30 2022 -0500 # Node ID 6a02245259d3588c04294ae99c02a16252dcb9f8 # Parent 4178904d769879e6c2919fb647ee6dd2736399e9 Fixed: There was no separator between "free spectate mode" and "players left" in the bottom HUD string. diff -r 4178904d7698 -r 6a02245259d3 src/g_shared/st_hud.cpp --- a/src/g_shared/st_hud.cpp Sat Dec 11 16:35:55 2021 -0500 +++ b/src/g_shared/st_hud.cpp Sun Jan 16 04:10:30 2022 -0500 @@ -451,10 +451,11 @@ // static void HUD_DrawBottomString( ULONG ulDisplayPlayer ) { + const bool bIsInFreeSpectateMode = CLIENTDEMO_IsInFreeSpectateMode( ); FString bottomString; // [BB] Draw a message to show that the free spectate mode is active. - if ( CLIENTDEMO_IsInFreeSpectateMode( )) + if ( bIsInFreeSpectateMode ) bottomString.AppendFormat( "Free Spectate Mode" ); // If the console player is looking through someone else's eyes, draw the following message. else if ( ulDisplayPlayer != static_cast( consoleplayer )) @@ -480,7 +481,7 @@ // [AK] Draw a message showing that we're waiting for players if we are. if ( gamestate == GAMESTATE_WAITFORPLAYERS ) { - if ( ulDisplayPlayer != static_cast( consoleplayer )) + if (( bIsInFreeSpectateMode ) || ( ulDisplayPlayer != static_cast( consoleplayer ))) bottomString += " - "; bottomString += TEXTCOLOR_RED "Waiting for players"; @@ -488,7 +489,7 @@ // Print the totals for living and dead allies/enemies. else if (( gamestate == GAMESTATE_INPROGRESS ) && ( GAMEMODE_GetCurrentFlags( ) & GMF_DEADSPECTATORS )) { - if ( ulDisplayPlayer != static_cast( consoleplayer )) + if (( bIsInFreeSpectateMode ) || ( ulDisplayPlayer != static_cast( consoleplayer ))) bottomString += " - "; // Survival, Survival Invasion, etc @@ -549,7 +550,7 @@ // If the console player is spectating, draw the spectator message. // [BB] Only when not in free spectate mode. - if (( r_drawspectatingstring ) && ( players[consoleplayer].bSpectating ) && ( CLIENTDEMO_IsInFreeSpectateMode( ) == false )) + if (( r_drawspectatingstring ) && ( players[consoleplayer].bSpectating ) && ( bIsInFreeSpectateMode == false )) { LONG lPosition = JOINQUEUE_GetPositionInLine( consoleplayer ); bottomString += "\n" TEXTCOLOR_GREEN;