From: Mario <zacjardine@y7mail.com>
Date: Tue, 14 Apr 2015 23:00:17 +0000 (+1000)
Subject: Merge branch 'master' into Mario/vaporizer_damage
X-Git-Tag: xonotic-v0.8.2~1917^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=253cc10990569fd90917dba809ce03c90fc89336;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/vaporizer_damage

Conflicts:
	qcsrc/common/weapons/w_vaporizer.qc
---

253cc10990569fd90917dba809ce03c90fc89336
diff --cc qcsrc/common/weapons/w_vaporizer.qc
index f55342f92,b67056f7e..649f0e314
--- a/qcsrc/common/weapons/w_vaporizer.qc
+++ b/qcsrc/common/weapons/w_vaporizer.qc
@@@ -54,11 -53,10 +54,11 @@@ void spawnfunc_weapon_minstanex(void) 
  
  void W_Vaporizer_Attack(void)
  {
 -	float flying;
 +	float flying, vaporizer_damage;
  	flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
 +	vaporizer_damage = ((WEP_CVAR_PRI(vaporizer, damage) > 0) ? WEP_CVAR_PRI(vaporizer, damage) : 10000);
  
- 	W_SetupShot(self, TRUE, 0, "", CH_WEAPON_A, vaporizer_damage);
 -	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, "weapons/minstanexfire.wav", VOL_BASE * 0.8, ATTEN_NORM);
diff --cc qcsrc/server/mutators/mutator_instagib.qc
index b15a21048,b3502b0f7..643d3ac88
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@@ -361,17 -365,9 +365,17 @@@ MUTATOR_HOOKFUNCTION(instagib_ItemCount
  		case IT_NAILS:      item_name = "item-extralife"; item_color = '1 0 0'; break;
  		case IT_INVINCIBLE: item_name = "item-speed"; item_color = '1 0 1'; break;
  	}
- 	return FALSE;
+ 	return false;
  }
  
 +MUTATOR_HOOKFUNCTION(instagib_PlayerDies)
 +{	
 +	if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
 +		frag_damage = 1000; // always gib if it was a vaporizer death
 +
 +	return FALSE;
 +}
 +
  MUTATOR_HOOKFUNCTION(instagib_ItemTouch)
  {
  	if(self.ammo_cells)