Merge branch 'master' into terencehill/dynamic_hud

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

diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh
index ade219a2459f9125677760a348a8895afc9712a7..0c0dd7568790ac5955f196249cdec79cc8440ac9 100644 (file)
--- a/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@ -1,34 +1,38 @@
+#ifndef TEAMS_H
+#define TEAMS_H
+
 #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 _("Red")
+#define NAME_TEAM_2 _("Blue")
+#define NAME_TEAM_3 _("Yellow")
+#define NAME_TEAM_4 _("Pink")
+#define NAME_TEAM _("Team")
+#define NAME_NEUTRAL _("Neutral")
 
 // used for replacement in filenames or such where the name CANNOT be allowed to be translated
 const string STATIC_NAME_TEAM_1 = "Red";
@@ -50,7 +54,7 @@ string Team_ColorCode(float teamid)
        case NUM_TEAM_3: return COL_TEAM_3;
        case NUM_TEAM_4: return COL_TEAM_4;
        }
-       
+
        return "^7";
 }
 
@@ -76,7 +80,7 @@ string Team_ColorName(float teamid)
        case NUM_TEAM_3: return NAME_TEAM_3;
        case NUM_TEAM_4: return NAME_TEAM_4;
        }
-       
+
     return NAME_NEUTRAL;
 }
 
@@ -90,7 +94,7 @@ string Static_Team_ColorName(float teamid)
        case NUM_TEAM_3: return STATIC_NAME_TEAM_3;
        case NUM_TEAM_4: return STATIC_NAME_TEAM_4;
        }
-       
+
     return NAME_NEUTRAL;
 }
 
@@ -104,7 +108,7 @@ float Team_ColorToTeam(string team_color)
        case "pink": return NUM_TEAM_4;
        case "auto": return 0;
        }
-       
+
        return -1;
 }
 
@@ -117,7 +121,7 @@ float Team_NumberToTeam(float number)
                case 3: return NUM_TEAM_3;
                case 4: return NUM_TEAM_4;
        }
-       
+
        return -1;
 }
 
@@ -130,7 +134,7 @@ float Team_TeamToNumber(float teamid)
                case NUM_TEAM_3: return 3;
                case NUM_TEAM_4: return 4;
        }
-       
+
        return -1;
 }
 
@@ -157,11 +161,7 @@ float Team_TeamToNumber(float teamid)
 #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)))
+#define SAME_TEAM(a,b) (teamplay ? (a.team == b.team) : (a == b))
+#define DIFF_TEAM(a,b) (teamplay ? (a.team != b.team) : (a != b))
+
+#endif