Merge branch 'master' into Mario/wepent_experimental

diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
index 7866f1b828e27d55312b3952c0b164a837b01e11,91042b613b7a425c8fc354a395a2392108a4697e..4e352c75d9452188e4a8012a171ad541adad757e
--- 1/qcsrc/common/weapons/weapon/vaporizer.qc
--- 2/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@@ -213,16 -212,16 +213,16 @@@ void W_Vaporizer_Attack(Weapon thiswep
        if(!(trace_dphitq3surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NOIMPACT)))
                W_RocketMinsta_Explosion(actor, trace_endpos);
  
 -      W_DecreaseAmmo(thiswep, actor, ((g_instagib) ? 1 : WEP_CVAR_PRI(vaporizer, ammo)));
 +      W_DecreaseAmmo(thiswep, actor, ((g_instagib) ? 1 : WEP_CVAR_PRI(vaporizer, ammo)), weaponentity);
  }
  
- void W_RocketMinsta_Laser_Explode (entity this)
+ void W_RocketMinsta_Laser_Explode (entity this, entity directhitentity)
  {
-       if(other.takedamage == DAMAGE_AIM)
-               if(IS_PLAYER(other))
-                       if(DIFF_TEAM(this.realowner, other))
-                               if(!IS_DEAD(other))
-                                       if(IsFlying(other))
+       if(directhitentity.takedamage == DAMAGE_AIM)
+               if(IS_PLAYER(directhitentity))
+                       if(DIFF_TEAM(this.realowner, directhitentity))
+                               if(!IS_DEAD(directhitentity))
+                                       if(IsFlying(directhitentity))
                                                Send_Notification(NOTIF_ONE, this.realowner, MSG_ANNCE, ANNCE_ACHIEVEMENT_ELECTROBITCH);
  
        this.event_damage = func_null;