Merge branch 'master' into Mario/combined_updates

diff --cc qcsrc/common/weapons/w_vortex.qc
index 7484f2bd9288a64677b899f1571abdf93fc7b903,3c0d21354de46d73af552d758ab95f81bd293f10..7175d980dde3e0ce38290b378f8c5310a661ac1e
--- 1/qcsrc/common/weapons/w_vortex.qc
--- 2/qcsrc/common/weapons/w_vortex.qc
+++ b/qcsrc/common/weapons/w_vortex.qc
@@@ -255,17 -253,22 +255,22 @@@ bool W_Vortex(int req
                case WR_INIT:
                {
                        precache_model("models/nexflash.md3");
 -                      precache_model("models/weapons/g_nex.md3");
 -                      precache_model("models/weapons/v_nex.md3");
 -                      precache_model("models/weapons/h_nex.iqm");
 -                      precache_sound("weapons/nexfire.wav");
 -                      precache_sound("weapons/nexcharge.wav");
 -                      precache_sound("weapons/nexwhoosh1.wav");
 -                      precache_sound("weapons/nexwhoosh2.wav");
 -                      precache_sound("weapons/nexwhoosh3.wav");
 -                      VORTEX_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
 +                      precache_model(W_Model("g_nex.md3"));
 +                      precache_model(W_Model("v_nex.md3"));
 +                      precache_model(W_Model("h_nex.iqm"));
 +                      precache_sound(W_Sound("nexfire"));
 +                      precache_sound(W_Sound("nexcharge"));
 +                      precache_sound(W_Sound("nexwhoosh1"));
 +                      precache_sound(W_Sound("nexwhoosh2"));
 +                      precache_sound(W_Sound("nexwhoosh3"));
 +                      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);
@@@ -291,9 -294,14 +296,14 @@@
                        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");
 +                      W_Reload(min(WEP_CVAR_PRI(vortex, ammo), WEP_CVAR_SEC(vortex, ammo)), W_Sound("reload"));
                        return true;
                }
                case WR_SUICIDEMESSAGE: