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;
case NUM_TEAM_3: return COL_TEAM_3;
case NUM_TEAM_4: return COL_TEAM_4;
}
-
+
return "^7";
}
{
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';
case NUM_TEAM_3: return NAME_TEAM_3;
case NUM_TEAM_4: return NAME_TEAM_4;
}
-
+
return NAME_NEUTRAL;
}
case NUM_TEAM_3: return STATIC_NAME_TEAM_3;
case NUM_TEAM_4: return STATIC_NAME_TEAM_4;
}
-
+
return NAME_NEUTRAL;
}
case "pink": return NUM_TEAM_4;
case "auto": return 0;
}
-
+
return -1;
}
case 3: return NUM_TEAM_3;
case 4: return NUM_TEAM_4;
}
-
+
return -1;
}
case NUM_TEAM_3: return 3;
case NUM_TEAM_4: return 4;
}
-
+
return -1;
}
// 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)))