Commit MetaInfo

Revision6a8e1a5979667a39244ae633dfff2e3076b41c0d (tree)
Time2021-06-02 11:58:48
AuthorAdam Kaminski <kaminskiadam9@gmai...>
CommiterAdam Kaminski

Log Message

Merged SCOREBOARD_SpellOrdinal and SCOREBOARD_SpellOrdinalColored into a single function, also replaced any escaped color codes with non-escaped ones.

Change Summary

Incremental Difference

diff -r 302b7dc1bc32 -r 6a8e1a597966 src/g_shared/shared_hud.cpp
--- a/src/g_shared/shared_hud.cpp Tue Jun 01 10:15:39 2021 -0400
+++ b/src/g_shared/shared_hud.cpp Tue Jun 01 22:58:48 2021 -0400
@@ -288,14 +288,7 @@
288288
289289 // [TP] Let's use the scoreboard's color here, I guess?
290290 // I suppose the scoreboard and hud should always show the same player.
291- switch ( SCOREBOARD_GetRank() )
292- {
293- case 0: stat = TEXTCOLOR_BLUE; break;
294- case 1: stat = TEXTCOLOR_RED; break;
295- case 2: stat = TEXTCOLOR_GREEN; break;
296- }
297-
298- stat += SCOREBOARD_SpellOrdinal( SCOREBOARD_GetRank() );
291+ stat = SCOREBOARD_SpellOrdinal( SCOREBOARD_GetRank(), true );
299292
300293 // [TP] Indicate tied status with an asterisk
301294 if ( SCOREBOARD_IsTied( CPlayer - players ))
diff -r 302b7dc1bc32 -r 6a8e1a597966 src/scoreboard.cpp
--- a/src/scoreboard.cpp Tue Jun 01 10:15:39 2021 -0400
+++ b/src/scoreboard.cpp Tue Jun 01 22:58:48 2021 -0400
@@ -1020,9 +1020,29 @@
10201020 //
10211021 // [TP] Now in a function
10221022 //
1023-FString SCOREBOARD_SpellOrdinal( int ranknum )
1023+FString SCOREBOARD_SpellOrdinal( int ranknum, bool bColored )
10241024 {
10251025 FString result;
1026+
1027+ // Determine what color and number to print for their rank.
1028+ if ( bColored )
1029+ {
1030+ switch ( ranknum )
1031+ {
1032+ case 0:
1033+ result = TEXTCOLOR_BLUE;
1034+ break;
1035+
1036+ case 1:
1037+ result = TEXTCOLOR_RED;
1038+ break;
1039+
1040+ case 2:
1041+ result = TEXTCOLOR_GREEN;
1042+ break;
1043+ }
1044+ }
1045+
10261046 result.AppendFormat( "%d", ranknum + 1 );
10271047
10281048 //[ES] This way all ordinals are correctly written.
@@ -1030,21 +1050,21 @@
10301050 {
10311051 switch ( ranknum % 10 )
10321052 {
1033- case 0:
1034- result += "st";
1035- break;
1053+ case 0:
1054+ result += "st";
1055+ break;
10361056
1037- case 1:
1038- result += "nd";
1039- break;
1057+ case 1:
1058+ result += "nd";
1059+ break;
10401060
1041- case 2:
1042- result += "rd";
1043- break;
1061+ case 2:
1062+ result += "rd";
1063+ break;
10441064
1045- default:
1046- result += "th";
1047- break;
1065+ default:
1066+ result += "th";
1067+ break;
10481068 }
10491069 }
10501070 else
@@ -1055,27 +1075,6 @@
10551075
10561076 //*****************************************************************************
10571077 //
1058-// [TP]
1059-//
1060-
1061-FString SCOREBOARD_SpellOrdinalColored( int ranknum )
1062-{
1063- FString result;
1064-
1065- // Determine what color and number to print for their rank.
1066- switch ( g_ulRank )
1067- {
1068- case 0: result = "\\cH"; break;
1069- case 1: result = "\\cG"; break;
1070- case 2: result = "\\cD"; break;
1071- }
1072-
1073- result += SCOREBOARD_SpellOrdinal( ranknum );
1074- return result;
1075-}
1076-
1077-//*****************************************************************************
1078-//
10791078 void SCOREBOARD_BuildPlaceString ( char* pszString )
10801079 {
10811080 if ( ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSONTEAMS ) && ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNFRAGS ) )
@@ -1096,7 +1095,7 @@
10961095 else
10971096 pszString[0] = 0;
10981097
1099- strcpy( pszString + strlen ( pszString ), SCOREBOARD_SpellOrdinalColored( g_ulRank ));
1098+ strcpy( pszString + strlen ( pszString ), SCOREBOARD_SpellOrdinal( g_ulRank, true ));
11001099
11011100 // Tack on the rest of the string.
11021101 if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNPOINTS )
@@ -1873,7 +1872,7 @@
18731872 szString[0] = 0;
18741873
18751874 // Determine what color and number to print for their rank.
1876- strcpy( szString + strlen ( szString ), SCOREBOARD_SpellOrdinalColored( g_ulRank ));
1875+ strcpy( szString + strlen ( szString ), SCOREBOARD_SpellOrdinal( g_ulRank, true ));
18771876
18781877 // Tack on the rest of the string.
18791878 if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS )
diff -r 302b7dc1bc32 -r 6a8e1a597966 src/scoreboard.h
--- a/src/scoreboard.h Tue Jun 01 10:15:39 2021 -0400
+++ b/src/scoreboard.h Tue Jun 01 22:58:48 2021 -0400
@@ -113,7 +113,6 @@
113113 LONG SCOREBOARD_GetSpread( void );
114114 LONG SCOREBOARD_GetLeftToLimit( void );
115115 bool SCOREBOARD_IsTied( void );
116-FString SCOREBOARD_SpellOrdinal( int ranknum );
117-FString SCOREBOARD_SpellOrdinalColored( int ranknum );
116+FString SCOREBOARD_SpellOrdinal( int ranknum, bool bColored = false );
118117
119118 #endif // __SCOREBOARD_H__
Show on old repository browser