Merge remote branch 'origin/master' into terencehill/infinite_ammo

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / tturrets / include / turrets_early.qh

diff --git a/qcsrc/server/tturrets/include/turrets_early.qh b/qcsrc/server/tturrets/include/turrets_early.qh
index 3fd62cff35ea4d884321c8ae82e3778ec9858976..d52c00307c0474f5ff59b7a6e81c0ddf79291826 100644 (file)
--- a/qcsrc/server/tturrets/include/turrets_early.qh
+++ b/qcsrc/server/tturrets/include/turrets_early.qh
@@ -37,6 +37,8 @@ vector real_origin(entity ent);
 #define TSF_NO_PATHBREAK  8
 /// Dont respawn
 #define TSL_NO_RESPAWN    16
+/// Let this turret roam when idle.
+#define TSL_ROAM          32
 
 /// target selection flags
 .float target_select_flags;
@@ -342,7 +344,8 @@ vector real_origin(entity ent);
 //.float target_select_fov;
 /// Last timestamp this turret aquierd a valid target
 .float target_select_time;
-
+/// Throttle re-validation of current target
+.float target_validate_time;
 /*
 * Aim refers to real aiming, not gun pos (thats done by track)
 */
@@ -455,19 +458,20 @@ void turrets_precash();
 
 // common
 .float turret_type;
-float TID_EWHEEL        = 1;
-float TID_FLAC          = 2;
-float TID_FUSION        = 3;
-float TID_HELLION       = 4;
-float TID_HK            = 5;
-float TID_MACHINEGUN    = 6;
-float TID_MLRS          = 7;
-float TID_PHASER        = 8;
-float TID_PLASMA        = 9;
-float TID_PLASMA_DUAL   = 10;
-float TID_TESLA         = 11;
-float TID_WALKER        = 12;
-float TID_LAST          = 12;
+float TID_COMMON        = 1;
+float TID_EWHEEL        = 2;
+float TID_FLAC          = 3;
+float TID_FUSION        = 4;
+float TID_HELLION       = 5;
+float TID_HK            = 6;
+float TID_MACHINEGUN    = 7;
+float TID_MLRS          = 8;
+float TID_PHASER        = 9;
+float TID_PLASMA        = 10;
+float TID_PLASMA_DUAL   = 11;
+float TID_TESLA         = 12;
+float TID_WALKER        = 13;
+float TID_LAST          = 13;
 
 float TNSF_UPDATE       = 2;
 float TNSF_STATUS       = 4;