Revision | 6a8e1a5979667a39244ae633dfff2e3076b41c0d (tree) |
---|---|
Time | 2021-06-02 11:58:48 |
Author | Adam Kaminski <kaminskiadam9@gmai...> |
Commiter | Adam Kaminski |
Merged SCOREBOARD_SpellOrdinal and SCOREBOARD_SpellOrdinalColored into a single function, also replaced any escaped color codes with non-escaped ones.
@@ -288,14 +288,7 @@ | ||
288 | 288 | |
289 | 289 | // [TP] Let's use the scoreboard's color here, I guess? |
290 | 290 | // 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 ); | |
299 | 292 | |
300 | 293 | // [TP] Indicate tied status with an asterisk |
301 | 294 | if ( SCOREBOARD_IsTied( CPlayer - players )) |
@@ -1020,9 +1020,29 @@ | ||
1020 | 1020 | // |
1021 | 1021 | // [TP] Now in a function |
1022 | 1022 | // |
1023 | -FString SCOREBOARD_SpellOrdinal( int ranknum ) | |
1023 | +FString SCOREBOARD_SpellOrdinal( int ranknum, bool bColored ) | |
1024 | 1024 | { |
1025 | 1025 | 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 | + | |
1026 | 1046 | result.AppendFormat( "%d", ranknum + 1 ); |
1027 | 1047 | |
1028 | 1048 | //[ES] This way all ordinals are correctly written. |
@@ -1030,21 +1050,21 @@ | ||
1030 | 1050 | { |
1031 | 1051 | switch ( ranknum % 10 ) |
1032 | 1052 | { |
1033 | - case 0: | |
1034 | - result += "st"; | |
1035 | - break; | |
1053 | + case 0: | |
1054 | + result += "st"; | |
1055 | + break; | |
1036 | 1056 | |
1037 | - case 1: | |
1038 | - result += "nd"; | |
1039 | - break; | |
1057 | + case 1: | |
1058 | + result += "nd"; | |
1059 | + break; | |
1040 | 1060 | |
1041 | - case 2: | |
1042 | - result += "rd"; | |
1043 | - break; | |
1061 | + case 2: | |
1062 | + result += "rd"; | |
1063 | + break; | |
1044 | 1064 | |
1045 | - default: | |
1046 | - result += "th"; | |
1047 | - break; | |
1065 | + default: | |
1066 | + result += "th"; | |
1067 | + break; | |
1048 | 1068 | } |
1049 | 1069 | } |
1050 | 1070 | else |
@@ -1055,27 +1075,6 @@ | ||
1055 | 1075 | |
1056 | 1076 | //***************************************************************************** |
1057 | 1077 | // |
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 | -// | |
1079 | 1078 | void SCOREBOARD_BuildPlaceString ( char* pszString ) |
1080 | 1079 | { |
1081 | 1080 | if ( ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSONTEAMS ) && ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNFRAGS ) ) |
@@ -1096,7 +1095,7 @@ | ||
1096 | 1095 | else |
1097 | 1096 | pszString[0] = 0; |
1098 | 1097 | |
1099 | - strcpy( pszString + strlen ( pszString ), SCOREBOARD_SpellOrdinalColored( g_ulRank )); | |
1098 | + strcpy( pszString + strlen ( pszString ), SCOREBOARD_SpellOrdinal( g_ulRank, true )); | |
1100 | 1099 | |
1101 | 1100 | // Tack on the rest of the string. |
1102 | 1101 | if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNPOINTS ) |
@@ -1873,7 +1872,7 @@ | ||
1873 | 1872 | szString[0] = 0; |
1874 | 1873 | |
1875 | 1874 | // 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 )); | |
1877 | 1876 | |
1878 | 1877 | // Tack on the rest of the string. |
1879 | 1878 | if ( GAMEMODE_GetCurrentFlags() & GMF_PLAYERSEARNWINS ) |
@@ -113,7 +113,6 @@ | ||
113 | 113 | LONG SCOREBOARD_GetSpread( void ); |
114 | 114 | LONG SCOREBOARD_GetLeftToLimit( void ); |
115 | 115 | 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 ); | |
118 | 117 | |
119 | 118 | #endif // __SCOREBOARD_H__ |