# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1644785126 18000
#      Sun Feb 13 15:45:26 2022 -0500
# Node ID fc3cb2c31bbd9fb2717a1d02f211332c3c691fb3
# Parent  d2c744b2ad50fe848c672c79fa6f2ef571e3f42f
Added new parameters to the previously moved HUD functions which control the text color, hold, and fade out times of the message. The "bInformClients" parameter for all these functions is now optional (false by default).

diff -r d2c744b2ad50 -r fc3cb2c31bbd src/g_shared/a_flags.cpp
--- a/src/g_shared/a_flags.cpp	Thu Feb 10 09:50:28 2022 -0500
+++ b/src/g_shared/a_flags.cpp	Sun Feb 13 15:45:26 2022 -0500
@@ -298,7 +298,7 @@
 		else
 			message += "skull";
 		message += "\nof a team with no players!";
-		HUD_DrawSUBSMessage( message.GetChars(), true, static_cast<ULONG>(pToucher->player - players), SVCF_ONLYTHISCLIENT );
+		HUD_DrawSUBSMessage( message.GetChars(), CR_UNTRANSLATED, 3.0f, 0.25f, true, static_cast<ULONG>(pToucher->player - players), SVCF_ONLYTHISCLIENT );
 		return ( DENY_PICKUP );
 	}
 
@@ -769,7 +769,7 @@
 	}
 
 	V_ColorizeString( szString );
-	HUD_DrawSUBSMessage( szString, true );
+	HUD_DrawSUBSMessage( szString, CR_UNTRANSLATED, 3.0f, 0.25f, true );
 
 	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
 	{
@@ -817,7 +817,7 @@
 
 	V_ColorizeString( szString );
 
-	HUD_DrawCNTRMessage( szString, false );
+	HUD_DrawCNTRMessage( szString, CR_UNTRANSLATED );
 }
 
 // White flag ---------------------------------------------------------------
@@ -1176,7 +1176,7 @@
 	sprintf( szString, "\\cCWhite flag returned" );
 	V_ColorizeString( szString );
 
-	HUD_DrawCNTRMessage( szString, false );
+	HUD_DrawCNTRMessage( szString, CR_UNTRANSLATED );
 }
 
 // Skulltag skull -----------------------------------------------------------
@@ -1386,7 +1386,7 @@
 	}
 
 	V_ColorizeString( szString );
-	HUD_DrawSUBSMessage( szString, true );
+	HUD_DrawSUBSMessage( szString, CR_UNTRANSLATED, true );
 
 	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
 	{
@@ -1434,5 +1434,5 @@
 
 	V_ColorizeString( szString );
 
-	HUD_DrawCNTRMessage( szString, false );
+	HUD_DrawCNTRMessage( szString, CR_UNTRANSLATED );
 }
diff -r d2c744b2ad50 -r fc3cb2c31bbd src/g_shared/st_hud.cpp
--- a/src/g_shared/st_hud.cpp	Thu Feb 10 09:50:28 2022 -0500
+++ b/src/g_shared/st_hud.cpp	Sun Feb 13 15:45:26 2022 -0500
@@ -888,58 +888,58 @@
 
 //*****************************************************************************
 //
-void HUD_DrawStandardMessage( const char *pszMessage, const bool bInformClients )
+void HUD_DrawStandardMessage( const char *pszMessage, EColorRange color, float fHoldTime, float fOutTime, const bool bInformClients )
 {
 	const LONG lId = MAKE_ID( 'C', 'N', 'T', 'R' );
 
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 	{
 		// Display the HUD message.
-		DHUDMessageFadeOut *pMsg = new DHUDMessageFadeOut( BigFont, pszMessage, 160.4f, 75.0f, 320, 200, CR_RED, 3.0f, 2.0f );
+		DHUDMessageFadeOut *pMsg = new DHUDMessageFadeOut( BigFont, pszMessage, 160.4f, 75.0f, 320, 200, color, fHoldTime, fOutTime );
 		StatusBar->AttachMessage( pMsg, lId );
 	}
 	// If necessary, send it to clients.
 	else if ( bInformClients )
 	{
-		SERVERCOMMANDS_PrintHUDMessage( pszMessage, 160.4f, 75.0f, 320, 200, HUDMESSAGETYPE_FADEOUT, CR_RED, 3.0f, 0.0f, 2.0f, "BigFont", lId );
+		SERVERCOMMANDS_PrintHUDMessage( pszMessage, 160.4f, 75.0f, 320, 200, HUDMESSAGETYPE_FADEOUT, color, fHoldTime, 0.0f, fOutTime, "BigFont", lId );
 	}
 }
 
 //*****************************************************************************
 // [BB] Expects pszMessage already to be colorized with V_ColorizeString.
-void HUD_DrawCNTRMessage( const char *pszMessage, const bool bInformClients, const ULONG ulPlayerExtra, const ULONG ulFlags )
+void HUD_DrawCNTRMessage( const char *pszMessage, EColorRange color, float fHoldTime, float fOutTime, const bool bInformClients, const ULONG ulPlayerExtra, const ULONG ulFlags )
 {
 	const LONG lId = MAKE_ID( 'C', 'N', 'T', 'R' );
 
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 	{
 		// Display the HUD message.
-		DHUDMessageFadeOut *pMsg = new DHUDMessageFadeOut( BigFont, pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f );
+		DHUDMessageFadeOut *pMsg = new DHUDMessageFadeOut( BigFont, pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, color, fHoldTime, fOutTime );
 		StatusBar->AttachMessage( pMsg, lId );
 	}
 	// If necessary, send it to clients.
 	else if ( bInformClients )
 	{
-		SERVERCOMMANDS_PrintHUDMessage( pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, HUDMESSAGETYPE_FADEOUT, CR_UNTRANSLATED, 3.0f, 0.0f, 0.25f, "BigFont", lId, ulPlayerExtra, ServerCommandFlags::FromInt( ulFlags ));
+		SERVERCOMMANDS_PrintHUDMessage( pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS, 0, 0, HUDMESSAGETYPE_FADEOUT, color, fHoldTime, 0.0f, fOutTime, "BigFont", lId, ulPlayerExtra, ServerCommandFlags::FromInt( ulFlags ));
 	}
 }
 
 //*****************************************************************************
 // [BB] Expects pszMessage already to be colorized with V_ColorizeString.
-void HUD_DrawSUBSMessage( const char *pszMessage, const bool bInformClients, const ULONG ulPlayerExtra, const ULONG ulFlags )
+void HUD_DrawSUBSMessage( const char *pszMessage, EColorRange color, float fHoldTime, float fOutTime, const bool bInformClients, const ULONG ulPlayerExtra, const ULONG ulFlags )
 {
 	const LONG lId = MAKE_ID( 'S', 'U', 'B', 'S' );
 
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 	{
 		// Display the HUD message.
-		DHUDMessageFadeOut *pMsg = new DHUDMessageFadeOut( SmallFont, pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, CR_UNTRANSLATED, 3.0f, 0.25f );
+		DHUDMessageFadeOut *pMsg = new DHUDMessageFadeOut( SmallFont, pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, color, fHoldTime, fOutTime );
 		StatusBar->AttachMessage( pMsg, lId );
 	}
 	// If necessary, send it to clients.
 	else if ( bInformClients )
 	{
-		SERVERCOMMANDS_PrintHUDMessage( pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, HUDMESSAGETYPE_FADEOUT, CR_UNTRANSLATED, 3.0f, 0.0f, 0.25f, "SmallFont", lId, ulPlayerExtra, ServerCommandFlags::FromInt( ulFlags ));
+		SERVERCOMMANDS_PrintHUDMessage( pszMessage, 1.5f, TEAM_MESSAGE_Y_AXIS_SUB, 0, 0, HUDMESSAGETYPE_FADEOUT, color, fHoldTime, 0.0f, fOutTime, "SmallFont", lId, ulPlayerExtra, ServerCommandFlags::FromInt( ulFlags ));
 	}
 }
 
diff -r d2c744b2ad50 -r fc3cb2c31bbd src/g_shared/st_hud.h
--- a/src/g_shared/st_hud.h	Thu Feb 10 09:50:28 2022 -0500
+++ b/src/g_shared/st_hud.h	Sun Feb 13 15:45:26 2022 -0500
@@ -74,9 +74,9 @@
 void	HUD_Refresh( void );
 void	HUD_DrawCoopInfo( void );
 void	HUD_DrawFragMessage( player_t *pFraggedPlayer, bool bFraggedBy );
-void	HUD_DrawStandardMessage( const char *pszMessage, const bool bInformClients = false );
-void	HUD_DrawCNTRMessage( const char *pszMessage, const bool bInformClients, const ULONG ulPlayerExtra = MAXPLAYERS, const ULONG ulFlags = 0 );
-void	HUD_DrawSUBSMessage( const char *pszMessage, const bool bInformClients, const ULONG ulPlayerExtra = MAXPLAYERS, const ULONG ulFlags = 0 );
+void	HUD_DrawStandardMessage( const char *pszMessage, EColorRange color, float fHoldTime = 3.0f, float fOutTime = 2.0f, const bool bInformClients = false );
+void	HUD_DrawCNTRMessage( const char *pszMessage, EColorRange color, float fHoldTime = 3.0f, float fOutTime = 0.25f, const bool bInformClients = false, const ULONG ulPlayerExtra = MAXPLAYERS, const ULONG ulFlags = 0 );
+void	HUD_DrawSUBSMessage( const char *pszMessage, EColorRange color, float fHoldTime = 3.0f, float fOutTime = 0.25f, const bool bInformClients = false, const ULONG ulPlayerExtra = MAXPLAYERS, const ULONG ulFlags = 0 );
 bool	HUD_ShouldDrawRank( ULONG ulPlayer );
 bool	HUD_IsTied( ULONG ulPlayerNum );
 bool	HUD_IsTied( void );
diff -r d2c744b2ad50 -r fc3cb2c31bbd src/invasion.cpp
--- a/src/invasion.cpp	Thu Feb 10 09:50:28 2022 -0500
+++ b/src/invasion.cpp	Sun Feb 13 15:45:26 2022 -0500
@@ -1282,7 +1282,7 @@
 
 		break;
 	case IS_MISSIONFAILED:
-		HUD_DrawStandardMessage( "MISSION FAILED!" );
+		HUD_DrawStandardMessage( "MISSION FAILED!", CR_RED );
 		break;
 	default:
 		break;
diff -r d2c744b2ad50 -r fc3cb2c31bbd src/p_spec.cpp
--- a/src/p_spec.cpp	Thu Feb 10 09:50:28 2022 -0500
+++ b/src/p_spec.cpp	Sun Feb 13 15:45:26 2022 -0500
@@ -971,7 +971,7 @@
 					V_ColorizeString( szString );
 
 					// Display "%s WINS!" HUD message.
-					HUD_DrawStandardMessage( szString, true );
+					HUD_DrawStandardMessage( szString, CR_RED, 3.0f, 2.0f, true );
 
 					GAME_SetEndLevelDelay( 5 * TICRATE );
 				}
diff -r d2c744b2ad50 -r fc3cb2c31bbd src/possession.cpp
--- a/src/possession.cpp	Thu Feb 10 09:50:28 2022 -0500
+++ b/src/possession.cpp	Sun Feb 13 15:45:26 2022 -0500
@@ -622,7 +622,7 @@
 		{
 			sprintf( szString, "\\cdSUDDEN DEATH!" );
 			V_ColorizeString( szString );
-			HUD_DrawStandardMessage( szString, true );
+			HUD_DrawStandardMessage( szString, CR_RED, 3.0f, 2.0f, true );
 		}
 
 		return;