Merge branch 'master' into terencehill/hud_code_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / teams.qh

diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh
index e77b7643cbdc80dd86c53d42e2a59e6b825654af..cde71c7b3cfdcf8a428d1221170d66d99dda5d77 100644 (file)
--- a/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@ -63,17 +63,10 @@ vector Team_ColorRGB(float teamid)
 {
        switch(teamid)
        {
-               #ifdef TEAMNUMBERS_THAT_ARENT_STUPID
-               case NUM_TEAM_1: return '1 0 0'; // red
-               case NUM_TEAM_2: return '0 0 1'; // blue
-               case NUM_TEAM_3: return '1 1 0'; // yellow
-               case NUM_TEAM_4: return '1 0 1'; // pink
-               #else
-               case NUM_TEAM_1: return '1 0.0625 0.0625';
-               case NUM_TEAM_2: return '0.0625 0.0625 1';
-               case NUM_TEAM_3: return '1 1 0.0625';
-               case NUM_TEAM_4: return '1 0.0625 1';
-               #endif
+               case NUM_TEAM_1: return '1 0.0625 0.0625'; // 0xFF0F0F
+               case NUM_TEAM_2: return '0.0625 0.0625 1'; // 0x0F0FFF
+               case NUM_TEAM_3: return '1 1 0.0625'; // 0xFFFF0F
+               case NUM_TEAM_4: return '1 0.0625 1'; // 0xFF0FFF
        }
 
     return '0 0 0';
@@ -92,6 +85,20 @@ string Team_ColorName(float teamid)
     return NAME_NEUTRAL;
 }
 
+// used for replacement in filenames or such where the name CANNOT be allowed to be translated
+string Static_Team_ColorName(float teamid)
+{
+    switch(teamid)
+    {
+               case NUM_TEAM_1: return STATIC_NAME_TEAM_1;
+       case NUM_TEAM_2: return STATIC_NAME_TEAM_2;
+       case NUM_TEAM_3: return STATIC_NAME_TEAM_3;
+       case NUM_TEAM_4: return STATIC_NAME_TEAM_4;
+       }
+       
+    return NAME_NEUTRAL;
+}
+
 float Team_ColorToTeam(string team_color)
 {
        switch(strtolower(team_color))
@@ -141,6 +148,10 @@ float Team_TeamToNumber(float teamid)
 #define Team_ColorName_Lower(teamid) strtolower(Team_ColorName(teamid))
 #define Team_ColorName_Upper(teamid) strtoupper(Team_ColorName(teamid))
 
+// used for replacement in filenames or such where the name CANNOT be allowed to be translated
+#define Static_Team_ColorName_Lower(teamid) strtolower(Static_Team_ColorName(teamid))
+#define Static_Team_ColorName_Upper(teamid) strtoupper(Static_Team_ColorName(teamid))
+
 #define Team_FullName(teamid) strcat(Team_ColorName(teamid), " ", NAME_TEAM, "^7")
 #define Team_ColoredFullName(teamid) strcat(Team_ColorCode(teamid), Team_ColorName(teamid), " ", NAME_TEAM, "^7")