]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/teams.qh
Merge branch 'master' into Mirio/balance
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / teams.qh
index 069904290b7d45361bdb7a1828ead5888bc3bca2..1f8a603dd01744b1dde6a4f13f98b5b32bb61d03 100644 (file)
@@ -1,34 +1,51 @@
+#pragma once
+
 #ifdef TEAMNUMBERS_THAT_ARENT_STUPID
-const float NUM_TEAM_1 = 1;  // red
-const float NUM_TEAM_2 = 2; // blue
-const float NUM_TEAM_3 = 3; // yellow
-const float NUM_TEAM_4 = 4; // pink
-const float NUM_SPECTATOR = 5;
+const int NUM_TEAM_1 = 1;  // red
+const int NUM_TEAM_2 = 2; // blue
+const int NUM_TEAM_3 = 3; // yellow
+const int NUM_TEAM_4 = 4; // pink
+const int NUM_SPECTATOR = 5;
 #else
 #ifdef CSQC
-const float NUM_TEAM_1 = 4;  // red
-const float NUM_TEAM_2 = 13; // blue
-const float NUM_TEAM_3 = 12; // yellow
-const float NUM_TEAM_4 = 9; // pink
+const int NUM_TEAM_1 = 4;  // red
+const int NUM_TEAM_2 = 13; // blue
+const int NUM_TEAM_3 = 12; // yellow
+const int NUM_TEAM_4 = 9; // pink
 #else
-const float NUM_TEAM_1 = 5;  // red
-const float NUM_TEAM_2 = 14; // blue
-const float NUM_TEAM_3 = 13; // yellow
-const float NUM_TEAM_4 = 10; // pink
+const int NUM_TEAM_1 = 5;  // red
+const int NUM_TEAM_2 = 14; // blue
+const int NUM_TEAM_3 = 13; // yellow
+const int NUM_TEAM_4 = 10; // pink
 #endif
-const float NUM_SPECTATOR = 1337;
+const int NUM_SPECTATOR = 1337;
 #endif
 
 const string COL_TEAM_1 = "^1";
 const string COL_TEAM_2 = "^4";
 const string COL_TEAM_3 = "^3";
 const string COL_TEAM_4 = "^6";
-const string NAME_TEAM_1 = _("Red");
-const string NAME_TEAM_2 = _("Blue");
-const string NAME_TEAM_3 = _("Yellow");
-const string NAME_TEAM_4 = _("Pink");
-const string NAME_TEAM = _("Team");
-const string NAME_NEUTRAL = _("Neutral");
+// must be #defined, const globals drop the translation attribute
+#define NAME_TEAM_1 CTX(_("TEAM^Red"))
+#define NAME_TEAM_2 CTX(_("TEAM^Blue"))
+#define NAME_TEAM_3 CTX(_("TEAM^Yellow"))
+#define NAME_TEAM_4 CTX(_("TEAM^Pink"))
+#define NAME_TEAM _("Team")
+#define NAME_NEUTRAL _("Neutral")
+
+// items colors, so they are handled properly in languages which decline things with grammatical gender
+#define KEY_TEAM_1 CTX(_("KEY^Red"))
+#define KEY_TEAM_2 CTX(_("KEY^Blue"))
+#define KEY_TEAM_3 CTX(_("KEY^Yellow"))
+#define KEY_TEAM_4 CTX(_("KEY^Pink"))
+#define FLAG_TEAM_1 CTX(_("FLAG^Red"))
+#define FLAG_TEAM_2 CTX(_("FLAG^Blue"))
+#define FLAG_TEAM_3 CTX(_("FLAG^Yellow"))
+#define FLAG_TEAM_4 CTX(_("FLAG^Pink"))
+#define GENERATOR_TEAM_1 CTX(_("GENERATOR^Red"))
+#define GENERATOR_TEAM_2 CTX(_("GENERATOR^Blue"))
+#define GENERATOR_TEAM_3 CTX(_("GENERATOR^Yellow"))
+#define GENERATOR_TEAM_4 CTX(_("GENERATOR^Pink"))
 
 // used for replacement in filenames or such where the name CANNOT be allowed to be translated
 const string STATIC_NAME_TEAM_1 = "Red";
@@ -43,12 +60,12 @@ float myteam;
 
 string Team_ColorCode(float teamid)
 {
-    switch(teamid)
-    {
+       switch(teamid)
+       {
                case NUM_TEAM_1: return COL_TEAM_1;
-       case NUM_TEAM_2: return COL_TEAM_2;
-       case NUM_TEAM_3: return COL_TEAM_3;
-       case NUM_TEAM_4: return COL_TEAM_4;
+               case NUM_TEAM_2: return COL_TEAM_2;
+               case NUM_TEAM_3: return COL_TEAM_3;
+               case NUM_TEAM_4: return COL_TEAM_4;
        }
 
        return "^7";
@@ -69,12 +86,12 @@ vector Team_ColorRGB(float teamid)
 
 string Team_ColorName(float teamid)
 {
-    switch(teamid)
-    {
+       switch(teamid)
+       {
                case NUM_TEAM_1: return NAME_TEAM_1;
-       case NUM_TEAM_2: return NAME_TEAM_2;
-       case NUM_TEAM_3: return NAME_TEAM_3;
-       case NUM_TEAM_4: return NAME_TEAM_4;
+               case NUM_TEAM_2: return NAME_TEAM_2;
+               case NUM_TEAM_3: return NAME_TEAM_3;
+               case NUM_TEAM_4: return NAME_TEAM_4;
        }
 
     return NAME_NEUTRAL;
@@ -83,12 +100,12 @@ string Team_ColorName(float teamid)
 // used for replacement in filenames or such where the name CANNOT be allowed to be translated
 string Static_Team_ColorName(float teamid)
 {
-    switch(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;
+               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;
@@ -99,10 +116,10 @@ float Team_ColorToTeam(string team_color)
        switch(strtolower(team_color))
        {
                case "red": return NUM_TEAM_1;
-       case "blue": return NUM_TEAM_2;
-       case "yellow": return NUM_TEAM_3;
-       case "pink": return NUM_TEAM_4;
-       case "auto": return 0;
+               case "blue": return NUM_TEAM_2;
+               case "yellow": return NUM_TEAM_3;
+               case "pink": return NUM_TEAM_4;
+               case "auto": return 0;
        }
 
        return -1;
@@ -154,14 +171,8 @@ float Team_TeamToNumber(float teamid)
 #define Team_NumberToColoredFullName(number) Team_ColoredFullName(Team_NumberToTeam(number))
 
 // replace these flags in a string with the strings provided
-#define TCR(input,teamcolor,teamtext) strreplace("^TC", teamcolor, strreplace("^TT", teamtext, input))
+#define TCR(input,type,team) strreplace("^TC", COL_TEAM_##team, strreplace("^TT", strtoupper(type##_TEAM_##team), 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)))
+#define SAME_TEAM(a,b) (teamplay ? (a.team == b.team) : (a == b))
+#define DIFF_TEAM(a,b) (teamplay ? (a.team != b.team) : (a != b))