提交: 6d16ad10f91bcbf9248dc7e8ad2b9255a620e9a1 - zandronum-macos-beta (hg)

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

Commit MetaInfo

• 修訂: 6d16ad10f91bcbf9248dc7e8ad2b9255a620e9a1 (tree)
• 時間: 2022-12-16 05:59:50
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Did some refactoring in TEAM_TimeExpired and replaced C-style char arrays with FString.

Change Summary

• modified: src/team.cpp

差異

diff -r cca76668e470 -r 6d16ad10f91b src/team.cpp
--- a/src/team.cpp	Thu Dec 15 15:59:08 2022 -0500
+++ b/src/team.cpp	Thu Dec 15 15:59:50 2022 -0500
@@ -754,8 +754,6 @@
 void TEAM_TimeExpired( void )
 {
 	LONG				lWinner = 0;
-	DHUDMessageFadeOut	*pMsg;
-	char				szString[64];
 	ULONG				lHighestScore;
 	ULONG				ulLeadingTeamsCount = 0;
 
@@ -792,33 +790,11 @@
 			lWinner = teams.Size( );
 
 		// If there was a tie, then go into sudden death!
-		if ( sv_suddendeath && ( (ULONG)lWinner == teams.Size( ) ) )
+		if (( sv_suddendeath ) && ( static_cast<ULONG>( lWinner ) == teams.Size( )))
 		{
 			// Only print the message the instant we reach sudden death.
-			if ( level.time == (int)( timelimit * TICRATE * 60 ))
-			{
-				sprintf( szString, "\\cdSUDDEN DEATH!" );
-				V_ColorizeString( szString );
-
-				if ( NETWORK_GetState( ) != NETSTATE_SERVER )
-				{
-					// Display the HUD message.
-					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') );
-				}
-				else
-				{
-					SERVERCOMMANDS_PrintHUDMessage( szString, 160.4f, 75.0f, 320, 200, HUDMESSAGETYPE_FADEOUT, CR_RED, 3.0f, 0.0f, 2.0f, "BigFont", MAKE_ID( 'C', 'N', 'T', 'R' ) );
-				}
-			}
+			if ( level.time == static_cast<int>( timelimit * TICRATE * 60 ))
+				HUD_DrawStandardMessage( "SUDDEN DEATH!", CR_GREEN, false, 3.0f, 2.0f, true );
 
 			return;
 		}