Proper delays

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index f8e96950ab39743100b8abaa2e3d0b279a18ad3a..2d1fb01f26e904312ff9d13025da5591cc3b89ac 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -174,6 +174,7 @@ void Vore_Regurgitate(entity e)
        e.eater.swallow_delay = time + cvar("g_balance_vore_swallow_delay");\r
        Vore_Weight_apply(e.eater);\r
 \r
+       e.weapon_delay = time + button_delay;\r
        e.system_delay = e.eater.system_delay = time + system_delay_time;\r
        e.eater = world;\r
 }\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 5a7e0e912b7d2bf4e9fb6e66d8f5cd91f3394ac4..f438db70f008805518e89ed36d6058b9fffd1cff 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -17,6 +17,9 @@ void W_Grabber_Touch2 (void)
 \r
 void W_Grabber_Attack2()\r
 {\r
+       if(time < self.weapon_delay)\r
+               return FALSE;\r
+\r
        W_SetupShot (self, TRUE, 0, "weapons/grabber_altfire.wav", cvar("g_balance_grabber_secondary_damage"));\r
 \r
        WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self));\r