From 374fc2161cfe252ef9e6b62132a62a2de2d94060 Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 30 Jan 2009 20:27:12 +0000 Subject: [PATCH] make spawnshield automatically disable when you shoot git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5699 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_weaponsystem.qc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index fdd4400aa..120d6d0fd 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -528,6 +528,9 @@ float weapon_prepareattack(float secondary, float attacktime) if (self.weaponentity.state != WS_READY) return FALSE; self.weaponentity.state = WS_INUSE; + + self.spawnshieldtime = min(self.spawnshieldtime, time); // kill spawn shield when you fire + // if the weapon hasn't been firing continuously, reset the timer if(attacktime >= 0) { -- 2.39.2