Remove more game mode dependent code from other files

[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 6d80ffdf49590d887b26344de9ec764fc5080b42..5a7e9d88b6742556c1d47ad5adbbdabdd5d91903 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -3,12 +3,6 @@
 // used in cheats.qc
 void ctf_RespawnFlag(entity flag)
 
-// used in portals.qc
-void ctf_Handle_Drop(entity player, float droptype);
-
-// used in g_damage.qc
-float ctf_ReadScore(string parameter); // SOON WON'T BE NEEDED. // FIXCTF
-
 // used in t_quake3.qc
 void spawnfunc_info_player_team1();
 void spawnfunc_info_player_team2();
@@ -27,20 +21,22 @@ void spawnfunc_ctf_team();
 #define FLAG_TOUCHRATE 0.5
 
 #define FLAG_DROP_OFFSET ('0 0 32')
-#define FLAG_CARRY_OFFSET ('-15 0 7')
+#define FLAG_CARRY_OFFSET ('-16 0 8')
 #define FLAG_SPAWN_OFFSET ('0 0 1' * (PL_MAX_z - 13))
 #define FLAG_WAYPOINT_OFFSET ('0 0 64')
 
-// sounds 
-.string noise4;
-.string noise5;
+// waypoint colors
+#define WPCOLOR_ENEMYFC(t) (colormapPaletteColor(t - 1, FALSE) * 0.75)
+#define WPCOLOR_FLAGCARRIER(t) (('0 0.75 0' + colormapPaletteColor(t - 1, FALSE)) * 0.5)
+#define WPCOLOR_DROPPEDFLAG(t) (('0.25 0.25 0.25' + colormapPaletteColor(t - 1, FALSE)) * 0.5)
 
+// sounds 
 #define snd_flag_taken noise
 #define snd_flag_returned noise1
 #define snd_flag_capture noise2
 #define snd_flag_respawn noise3
-#define snd_flag_dropped noise4
-#define snd_flag_touch noise5
+.string snd_flag_dropped;
+.string snd_flag_touch;
 
 // list of flags on the map
 entity ctf_worldflaglist;
@@ -51,15 +47,24 @@ entity ctf_worldflaglist;
 .entity wps_flagbase; 
 .entity wps_flagcarrier;
 .entity wps_flagdropped;
+.entity wps_enemyflagcarrier;
 
 // statuses
 #define FLAG_BASE 1
-#define FLAG_CARRY 2
-#define FLAG_DROPPED 3
+#define FLAG_DROPPED 2
+#define FLAG_CARRY 3
 #define FLAG_PASSING 4
 
-#define DROPTYPE_NORMAL 1
-#define DROPTYPE_THROWN 2
+#define DROP_NORMAL 1
+#define DROP_THROW 2
+#define DROP_PASS 3
+#define DROP_RESET 4
+
+#define PICKUP_BASE 1
+#define PICKUP_DROPPED 2
+
+#define CAPTURE_NORMAL 1
+#define CAPTURE_DROPPED 2
 
 // flag properties
 #define ctf_spawnorigin dropped_origin
@@ -67,12 +72,16 @@ float ctf_captimerecord; // record time for capturing the flag
 .float ctf_pickuptime;
 .float ctf_droptime;
 .float ctf_status; // status of the flag (FLAG_BASE, FLAG_DROPPED, FLAG_CARRY declared globally)
-.float max_flag_health;
-.entity ctf_pickupper;
+.entity ctf_carrier;
 .entity ctf_dropper; // don't allow spam of dropping the flag
+.float max_flag_health;
+.float next_take_time;
+.float wpforenemy_announced;
 
-// other properties
-.float pass_antispam;
+// passing properties
+.entity pass_sender;
+.entity pass_target;
+.float throw_antispam;
 
 // CaptureShield: If the player is too bad to be allowed to capture, shield them from taking the flag.
 .float ctf_captureshielded; // set to 1 if the player is too bad to be allowed to capture