Get rid of TEAM_SV_TO_CL and TEAM_CL_TO_SV aliases

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

diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh
index ef1b3c7f46e66fe4207b158704688deb1688901f..00500a1614a378459093e1ba87ad62a1f05f51ba 100644 (file)
--- a/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@ -30,6 +30,11 @@ const string STR_TEAM_4 = _("Pink");
 const string STR_TEAM = _("Team");
 const string STR_NEUTRAL = _("Neutral");
 
+#define APP_TEAM_NUM_2(num,prefix) ((num == FL_TEAM_1) ? prefix##RED : prefix##BLUE)
+#define APP_TEAM_NUM_4(num,prefix) ((num == FL_TEAM_1) ? prefix##RED : ((num == FL_TEAM_2) ? prefix##BLUE : ((num == FL_TEAM_3) ? prefix##YELLOW : prefix##PINK)))
+#define APP_TEAM_ENT_2(ent,prefix) ((ent.team == FL_TEAM_1) ? prefix##RED : prefix##BLUE)
+#define APP_TEAM_ENT_4(ent,prefix) ((ent.team == FL_TEAM_1) ? prefix##RED : ((ent.team == FL_TEAM_2) ? prefix##BLUE : ((ent.team == FL_TEAM_3) ? prefix##YELLOW : prefix##PINK)))
+
 #ifdef CSQC
 float teamplay;
 float myteam;
@@ -123,15 +128,15 @@ 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))
 
-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_FullName(teamid) strcat(Team_ColorName(teamid), " ", STR_TEAM, "^7")
+#define Team_ColoredFullName(teamid) strcat(Team_ColorCode(teamid), Team_ColorName(teamid), " ", STR_TEAM, "^7")
 
-string Team_NumberToFullName(float number) { return Team_FullName(Team_NumberToTeam(number)); }
-string Team_NumberToColoredFullName(float number) { return Team_ColoredFullName(Team_NumberToTeam(number)); }
+#define Team_NumberToFullName(number) Team_FullName(Team_NumberToTeam(number))
+#define Team_NumberToColoredFullName(number) Team_ColoredFullName(Team_NumberToTeam(number))