Fix compilation with gmqcc.

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

diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh
index c9bed09a626da42d29209871b51886a00e65bbf1..ade219a2459f9125677760a348a8895afc9712a7 100644 (file)
--- a/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@ -30,10 +30,11 @@ const string NAME_TEAM_4 = _("Pink");
 const string NAME_TEAM = _("Team");
 const string NAME_NEUTRAL = _("Neutral");
 
-#define APP_TEAM_NUM_2(num,prefix) ((num == NUM_TEAM_1) ? prefix##RED : prefix##BLUE)
-#define APP_TEAM_NUM_4(num,prefix) ((num == NUM_TEAM_1) ? prefix##RED : ((num == NUM_TEAM_2) ? prefix##BLUE : ((num == NUM_TEAM_3) ? prefix##YELLOW : prefix##PINK)))
-#define APP_TEAM_ENT_2(ent,prefix) ((ent.team == NUM_TEAM_1) ? prefix##RED : prefix##BLUE)
-#define APP_TEAM_ENT_4(ent,prefix) ((ent.team == NUM_TEAM_1) ? prefix##RED : ((ent.team == NUM_TEAM_2) ? prefix##BLUE : ((ent.team == NUM_TEAM_3) ? prefix##YELLOW : prefix##PINK)))
+// used for replacement in filenames or such where the name CANNOT be allowed to be translated
+const string STATIC_NAME_TEAM_1 = "Red";
+const string STATIC_NAME_TEAM_2 = "Blue";
+const string STATIC_NAME_TEAM_3 = "Yellow";
+const string STATIC_NAME_TEAM_4 = "Pink";
 
 #ifdef CSQC
 float teamplay;
@@ -57,17 +58,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';
@@ -86,6 +80,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))
@@ -135,6 +143,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")
 
@@ -143,3 +155,13 @@ float Team_TeamToNumber(float teamid)
 
 // replace these flags in a string with the strings provided
 #define TCR(input,teamcolor,teamtext) strreplace("^TC", teamcolor, strreplace("^TT", teamtext, input))
+
+// safe team comparisons
+#define SAME_TEAM(a,b) (teamplay ? ((a.team == b.team) ? 1 : 0) : ((a == b) ? 1 : 0))
+#define DIFF_TEAM(a,b) (teamplay ? ((a.team != b.team) ? 1 : 0) : ((a != b) ? 1 : 0))
+
+// used for notification system multi-team identifiers
+#define APP_TEAM_NUM_2(num,prefix) ((num == NUM_TEAM_1) ? prefix##RED : prefix##BLUE)
+#define APP_TEAM_NUM_4(num,prefix) ((num == NUM_TEAM_1) ? prefix##RED : ((num == NUM_TEAM_2) ? prefix##BLUE : ((num == NUM_TEAM_3) ? prefix##YELLOW : prefix##PINK)))
+#define APP_TEAM_ENT_2(ent,prefix) ((ent.team == NUM_TEAM_1) ? prefix##RED : prefix##BLUE)
+#define APP_TEAM_ENT_4(ent,prefix) ((ent.team == NUM_TEAM_1) ? prefix##RED : ((ent.team == NUM_TEAM_2) ? prefix##BLUE : ((ent.team == NUM_TEAM_3) ? prefix##YELLOW : prefix##PINK)))