From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 7 Sep 2010 17:28:22 +0000 (+0300)
Subject: Proper delays
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=04b1e07d5d031aee59f093bc550f2a00edb27b81;hp=491e27ab158975d9adcf200cb7f55608365e7d32

Proper delays
---

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index f8e96950..2d1fb01f 100644
--- 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");
 	Vore_Weight_apply(e.eater);
 
+	e.weapon_delay = time + button_delay;
 	e.system_delay = e.eater.system_delay = time + system_delay_time;
 	e.eater = world;
 }
diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 5a7e0e91..f438db70 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -17,6 +17,9 @@ void W_Grabber_Touch2 (void)
 
 void W_Grabber_Attack2()
 {
+	if(time < self.weapon_delay)
+		return FALSE;
+
 	W_SetupShot (self, TRUE, 0, "weapons/grabber_altfire.wav", cvar("g_balance_grabber_secondary_damage"));
 
 	WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self));