From: Mario <mario@smbclan.net>
Date: Sun, 25 Dec 2016 11:07:16 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9e84ff8daa3826ef32e2891a7c5224a7cd436d23;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental
---

9e84ff8daa3826ef32e2891a7c5224a7cd436d23
diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
index 7866f1b82,91042b613..4e352c75d
--- a/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;