Merge branch 'master' into divVerent/4team_ctf

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_ctf.qh

diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index 383647129f961778248a996ded8c9ceeaf3a9091..7a19116f9951683b8e52afaf3177db536e07be79 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -1,7 +1,8 @@
 // these are needed since mutators are compiled last
 
+#ifdef SVQC
 // used in cheats.qc
-void ctf_RespawnFlag(entity flag)
+void ctf_RespawnFlag(entity flag);
 
 // score rule declarations
 #define ST_CTF_CAPS 1
@@ -100,6 +101,7 @@ float ctf_captimerecord; // record time for capturing the flag
 .entity ctf_dropper; // don't allow spam of dropping the flag
 .float max_flag_health;
 .float next_take_time;
+float ctf_teams;
 
 // passing/throwing properties
 .float pass_distance;
@@ -131,6 +133,7 @@ float havocbot_ctf_middlepoint_radius;
 
 void havocbot_role_ctf_setrole(entity bot, float role);
 
-// client notification cvars
-.float PICKUP_TEAM_VERBOSE;
-.float PICKUP_ENEMY_VERBOSE;
+// team checking
+#define CTF_SAMETEAM(a,b) (autocvar_g_ctf_reverse ? DIFF_TEAM(a,b) : SAME_TEAM(a,b))
+#define CTF_DIFFTEAM(a,b) (autocvar_g_ctf_reverse ? SAME_TEAM(a,b) : DIFF_TEAM(a,b))
+#endif