From: Mario <mario@smbclan.net>
Date: Sun, 24 Jul 2016 02:26:50 +0000 (+1000)
Subject: Fix Arc firing after warmup ends
X-Git-Tag: xonotic-v0.8.2~700^2~46
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b84ee2ab7227a24c014043692372f95f7e8def41;p=xonotic%2Fxonotic-data.pk3dir.git

Fix Arc firing after warmup ends
---

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index 012b2c0f1..5093f6b5e 100644
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -333,12 +333,10 @@ void W_Arc_Beam_Think(entity this)
 		||
 		IS_DEAD(this.owner)
 		||
-		gameover
+		forbidWeaponUse(this.owner)
 		||
 		(!PHYS_INPUT_BUTTON_ATCK(this.owner) && !burst )
 		||
-		STAT(FROZEN, this.owner)
-		||
 		this.owner.vehicle
 		||
 		(WEP_CVAR(arc, overheat_max) > 0 && this.beam_heat >= WEP_CVAR(arc, overheat_max))
diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc
index 9c8c2c37a..80adb45da 100644
--- a/qcsrc/common/weapons/weapon/shockwave.qc
+++ b/qcsrc/common/weapons/weapon/shockwave.qc
@@ -586,7 +586,7 @@ void W_Shockwave_Attack(entity actor)
 			vector nearest_on_line = (w_shotorg + a * w_shotdir);
 			vector nearest_to_attacker = WarpZoneLib_NearestPointOnBox(center + head.mins, center + head.maxs, nearest_on_line);
 
-			if((vlen(head.WarpZone_findradius_dist) <= WEP_CVAR(shockwave, blast_distance))
+			if((vdist(head.WarpZone_findradius_dist, <=, WEP_CVAR(shockwave, blast_distance)))
 				&& (W_Shockwave_Attack_IsVisible(actor, head, nearest_on_line, w_shotorg, attack_endpos)))
 			{
 				// calculate importance of distance and accuracy for this attack