Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

[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 8e067caf012136c0d7d3657de4e17df953f2d80c..882b1064b49de78ce2d1c7dfcda641b4601839c5 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
@@ -132,7 +133,11 @@ float havocbot_ctf_middlepoint_radius;
 void havocbot_role_ctf_setrole(entity bot, float role);
 
 // client notification stuff
-#define RED_OR_BLUE(ent,prefix) ((ent.team == FL_TEAM_1) ? prefix##RED : prefix##BLUE)
 .float CAPTURE_VERBOSE;
 .float PICKUP_TEAM_VERBOSE;
 .float PICKUP_ENEMY_VERBOSE;
+#else
+var float autocvar_notification_ctf_pickup_team_verbose = FALSE;
+var float autocvar_notification_ctf_pickup_enemy_verbose = FALSE;
+#endif
+var float autocvar_notification_ctf_capture_verbose = FALSE;