X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fteams.qh;h=ade219a2459f9125677760a348a8895afc9712a7;hp=c1ef62d95079a669b82ac7b54a388ca3ed8743bf;hb=6a28c11c8abd729c7f95ad7050d204aa2453d2ff;hpb=30e9db455abe691a3560555a989beb382b3b2531

diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh
index c1ef62d950..ade219a245 100644
--- a/qcsrc/common/teams.qh
+++ b/qcsrc/common/teams.qh
@@ -36,11 +36,6 @@ const string STATIC_NAME_TEAM_2 = "Blue";
 const string STATIC_NAME_TEAM_3 = "Yellow";
 const string STATIC_NAME_TEAM_4 = "Pink";
 
-#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;
 float myteam;
@@ -63,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';
@@ -167,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)))