Trying to restructure hud panel code making use of an entity for each panel

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

diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh
index ef1b3c7f46e66fe4207b158704688deb1688901f..c9bed09a626da42d29209871b51886a00e65bbf1 100644 (file)
--- a/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@ -1,34 +1,39 @@
 #ifdef TEAMNUMBERS_THAT_ARENT_STUPID
-const float FL_TEAM_1 = 1;  // red
-const float FL_TEAM_2 = 2; // blue
-const float FL_TEAM_3 = 3; // yellow
-const float FL_TEAM_4 = 4; // pink
-const float FL_SPECTATOR = 5;
+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;
 #else
 #ifdef CSQC
-const float FL_TEAM_1 = 4;  // red
-const float FL_TEAM_2 = 13; // blue
-const float FL_TEAM_3 = 12; // yellow
-const float FL_TEAM_4 = 9; // pink
+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
 #else
-const float FL_TEAM_1 = 5;  // red
-const float FL_TEAM_2 = 14; // blue
-const float FL_TEAM_3 = 13; // yellow
-const float FL_TEAM_4 = 10; // pink
+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
 #endif
-const float FL_SPECTATOR = 1337;
+const float 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 STR_TEAM_1 = _("Red");
-const string STR_TEAM_2 = _("Blue");
-const string STR_TEAM_3 = _("Yellow");
-const string STR_TEAM_4 = _("Pink");
-const string STR_TEAM = _("Team");
-const string STR_NEUTRAL = _("Neutral");
+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");
+
+#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)))
 
 #ifdef CSQC
 float teamplay;
@@ -39,10 +44,10 @@ string Team_ColorCode(float teamid)
 {
     switch(teamid)
     {
-               case FL_TEAM_1: return COL_TEAM_1;
-       case FL_TEAM_2: return COL_TEAM_2;
-       case FL_TEAM_3: return COL_TEAM_3;
-       case FL_TEAM_4: return COL_TEAM_4;
+               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;
        }
        
        return "^7";
@@ -53,15 +58,15 @@ vector Team_ColorRGB(float teamid)
        switch(teamid)
        {
                #ifdef TEAMNUMBERS_THAT_ARENT_STUPID
-               case FL_TEAM_1: return '1 0 0'; // red
-               case FL_TEAM_2: return '0 0 1'; // blue
-               case FL_TEAM_3: return '1 1 0'; // yellow
-               case FL_TEAM_4: return '1 0 1'; // pink
+               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 FL_TEAM_1: return '1 0.0625 0.0625';
-               case FL_TEAM_2: return '0.0625 0.0625 1';
-               case FL_TEAM_3: return '1 1 0.0625';
-               case FL_TEAM_4: return '1 0.0625 1';
+               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
        }
 
@@ -72,23 +77,23 @@ string Team_ColorName(float teamid)
 {
     switch(teamid)
     {
-               case FL_TEAM_1: return STR_TEAM_1;
-       case FL_TEAM_2: return STR_TEAM_2;
-       case FL_TEAM_3: return STR_TEAM_3;
-       case FL_TEAM_4: return STR_TEAM_4;
+               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;
        }
        
-    return STR_NEUTRAL;
+    return NAME_NEUTRAL;
 }
 
 float Team_ColorToTeam(string team_color)
 {
        switch(strtolower(team_color))
        {
-               case "red": return FL_TEAM_1;
-       case "blue": return FL_TEAM_2;
-       case "yellow": return FL_TEAM_3;
-       case "pink": return FL_TEAM_4;
+               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;
        }
        
@@ -99,10 +104,10 @@ float Team_NumberToTeam(float number)
 {
        switch(number)
        {
-               case 1: return FL_TEAM_1;
-               case 2: return FL_TEAM_2;
-               case 3: return FL_TEAM_3;
-               case 4: return FL_TEAM_4;
+               case 1: return NUM_TEAM_1;
+               case 2: return NUM_TEAM_2;
+               case 3: return NUM_TEAM_3;
+               case 4: return NUM_TEAM_4;
        }
        
        return -1;
@@ -112,10 +117,10 @@ float Team_TeamToNumber(float teamid)
 {
        switch(teamid)
        {
-               case FL_TEAM_1: return 1;
-               case FL_TEAM_2: return 2;
-               case FL_TEAM_3: return 3;
-               case FL_TEAM_4: return 4;
+               case NUM_TEAM_1: return 1;
+               case NUM_TEAM_2: return 2;
+               case NUM_TEAM_3: return 3;
+               case NUM_TEAM_4: return 4;
        }
        
        return -1;
@@ -123,15 +128,18 @@ float Team_TeamToNumber(float teamid)
 
 
 // legacy aliases for shitty code
-float TeamByColor(float teamid) { return (Team_TeamToNumber(teamid) - 1); }
-float ColorByTeam(float number) { return Team_NumberToTeam(number + 1); }
+#define TeamByColor(teamid) (Team_TeamToNumber(teamid) - 1)
+#define ColorByTeam(number) Team_NumberToTeam(number + 1)
 
 // useful aliases
-string Team_ColorName_Lower(float teamid) { return strtolower(Team_ColorName(teamid)); }
-string Team_ColorName_Upper(float teamid) { return strtoupper(Team_ColorName(teamid)); }
+#define Team_ColorName_Lower(teamid) strtolower(Team_ColorName(teamid))
+#define Team_ColorName_Upper(teamid) strtoupper(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")
 
-string Team_FullName(float teamid) { return strcat(Team_ColorName(teamid), " ", STR_TEAM, "^7"); }
-string Team_ColoredFullName(float teamid) { return strcat(Team_ColorCode(teamid), Team_ColorName(teamid), " ", STR_TEAM, "^7"); }
+#define Team_NumberToFullName(number) Team_FullName(Team_NumberToTeam(number))
+#define Team_NumberToColoredFullName(number) Team_ColoredFullName(Team_NumberToTeam(number))
 
-string Team_NumberToFullName(float number) { return Team_FullName(Team_NumberToTeam(number)); }
-string Team_NumberToColoredFullName(float number) { return 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))