Weapons: Introduce concept of offhand weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / shockwave.qc

diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc
index 859c80e898eabbe3c09c87958a1c7d676d0870ad..713ac59c75ed8aa122de7d00e65a3e0eecb1806a 100644 (file)
--- a/qcsrc/common/weapons/weapon/shockwave.qc
+++ b/qcsrc/common/weapons/weapon/shockwave.qc
@@ -677,9 +677,9 @@ void W_Shockwave_Attack(void)
 
                        return true;
                }
-               METHOD(Shockwave, wr_think, bool(entity thiswep))
+               METHOD(Shockwave, wr_think, bool(entity thiswep, bool fire1, bool fire2))
                {
-                       if(self.BUTTON_ATCK)
+                       if(fire1)
                        {
                                if(time >= self.shockwave_blasttime) // handle refire separately so the secondary can be fired straight after a primary
                                {
@@ -691,7 +691,7 @@ void W_Shockwave_Attack(void)
                                        }
                                }
                        }
-                       else if(self.BUTTON_ATCK2)
+                       else if(fire2)
                        {
                                //if(self.clip_load >= 0) // we are not currently reloading
                                if(!self.crouch) // no crouchmelee please