From: Mario <zacjardine@y7mail.com>
Date: Fri, 24 Apr 2015 05:33:32 +0000 (+1000)
Subject: Add a couple of missing pieces for the impressive announcement
X-Git-Tag: xonotic-v0.8.1~74
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e42210add9b5b8b80d134b76ce167bf32b5cc081;p=xonotic%2Fxonotic-data.pk3dir.git

Add a couple of missing pieces for the impressive announcement
---

diff --git a/qcsrc/common/weapons/w_vortex.qc b/qcsrc/common/weapons/w_vortex.qc
index 6deff5e57..3c0d21354 100644
--- a/qcsrc/common/weapons/w_vortex.qc
+++ b/qcsrc/common/weapons/w_vortex.qc
@@ -264,6 +264,11 @@ bool W_Vortex(int req)
 			VORTEX_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
 			return true;
 		}
+		case WR_SETUP:
+		{
+			self.vortex_lasthit = 0;
+			return true;
+		}
 		case WR_CHECKAMMO1:
 		{
 			ammo_amount = self.WEP_AMMO(VORTEX) >= WEP_CVAR_PRI(vortex, ammo);
@@ -289,6 +294,11 @@ bool W_Vortex(int req)
 			VORTEX_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
 			return true;
 		}
+		case WR_RESETPLAYER:
+		{
+			self.vortex_lasthit = 0;
+			return true;
+		}
 		case WR_RELOAD:
 		{
 			W_Reload(min(WEP_CVAR_PRI(vortex, ammo), WEP_CVAR_SEC(vortex, ammo)), "weapons/reload.wav");