From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 2 Sep 2015 10:05:23 +0000 (+1000)
Subject: Merge branch 'master' into TimePath/global_self
X-Git-Tag: xonotic-v0.8.2~1931^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c758278958da8f2baf1f39cd0f298d5bda097a2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/global_self

# Conflicts:
#	qcsrc/common/weapons/weapon/vaporizer.qc
---

1c758278958da8f2baf1f39cd0f298d5bda097a2
diff --cc qcsrc/common/weapons/weapon/vaporizer.qc
index aa1fb54c1,256019d69..399ce4e58
--- a/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@@ -69,11 -70,11 +70,11 @@@ void W_RocketMinsta_Explosion(vector lo
  }
  
  void W_Vaporizer_Attack(void)
 -{
 +{SELFPARAM();
- 	float flying;
- 	flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
+ 	bool flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
+ 	float vaporizer_damage = ((WEP_CVAR_PRI(vaporizer, damage) > 0) ? WEP_CVAR_PRI(vaporizer, damage) : 10000);
  
- 	W_SetupShot(self, true, 0, "", CH_WEAPON_A, 10000);
+ 	W_SetupShot(self, true, 0, "", CH_WEAPON_A, vaporizer_damage);
  	// handle sound separately so we can change the volume
  	// added bonus: no longer plays the strength sound (strength gives no bonus to instakill anyway)
  	sound (self, CH_WEAPON_A, W_Sound("minstanexfire"), VOL_BASE * 0.8, ATTEN_NORM);
diff --cc qcsrc/server/mutators/mutator_instagib.qc
index 3295255de,2b69551e7..ee9c6de8c
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@@ -385,8 -390,16 +387,16 @@@ MUTATOR_HOOKFUNCTION(instagib_ItemCount
  	return false;
  }
  
+ MUTATOR_HOOKFUNCTION(instagib_PlayerDies)
+ {	
+ 	if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER.m_id))
+ 		frag_damage = 1000; // always gib if it was a vaporizer death
+ 
+ 	return FALSE;
+ }
+ 
  MUTATOR_HOOKFUNCTION(instagib_ItemTouch)
 -{
 +{SELFPARAM();
  	if(self.ammo_cells)
  	{
  		// play some cool sounds ;)