Commit: cca76668e470b1756b59739dcf90c870898370a6 - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• Revisão: cca76668e470b1756b59739dcf90c870898370a6 (tree)
• Hora: 2022-12-16 05:59:08
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Mensagem de Log

Refactored TEAM_DoWinSequence and replaced C-style char arrays with FString. This also fixes an inconsistency in the fadeout times if whether or not the server prints the message.

Mudança Sumário

• modified: src/team.cpp

Diff

diff -r 51750a5f66fc -r cca76668e470 src/team.cpp
--- a/src/team.cpp	Fri Dec 16 10:33:49 2022 -0500
+++ b/src/team.cpp	Thu Dec 15 15:59:08 2022 -0500
@@ -731,34 +731,22 @@
 //
 void TEAM_DoWinSequence( ULONG ulTeamIdx )
 {
-	char				szString[32];
-	DHUDMessageFadeOut	*pMsg;
+	FString message;
+	EColorRange color;
 
 	// Display "%s WINS!" HUD message.
-	if ( ulTeamIdx < teams.Size( ) )
-		sprintf( szString, "\\c%s%s WINS!", TEAM_GetTextColorName( ulTeamIdx ), TEAM_GetName( ulTeamIdx ) );
-	else
-		sprintf( szString, "DRAW GAME!\n" );
-
-	V_ColorizeString( szString );
-
-	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
+	if ( ulTeamIdx < teams.Size( ))
 	{
-		pMsg = new DHUDMessageFadeOut( BigFont, szString,
-			160.4f,
-			75.0f,
-			320,
-			200,
-			CR_UNTRANSLATED,
-			3.0f,
-			2.0f );
-
-		StatusBar->AttachMessage( pMsg, MAKE_ID('C','N','T','R') );
+		message.AppendFormat( "%s WINS!", TEAM_GetName( ulTeamIdx ));
+		color = static_cast<EColorRange>( TEAM_GetTextColor( ulTeamIdx ));
 	}
 	else
 	{
-		SERVERCOMMANDS_PrintHUDMessage( szString, 160.4f, 75.0f, 320, 200, HUDMESSAGETYPE_FADEOUT, CR_RED, 3.0f, 0.0f, 0.25f, "BigFont", MAKE_ID( 'C', 'N', 'T', 'R' ) );
+		message = "DRAW GAME!";
+		color = CR_RED;
 	}
+
+	HUD_DrawStandardMessage( message.GetChars( ), color, false, 3.0f, 2.0f, true );
 }
 
 //*****************************************************************************