Merge branch 'master' into TimePath/global_self
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 2 Sep 2015 10:05:23 +0000 (20:05 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 2 Sep 2015 10:05:23 +0000 (20:05 +1000)
# Conflicts:
# qcsrc/common/weapons/weapon/vaporizer.qc

1  2 
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/server/cl_player.qc
qcsrc/server/mutators/mutator_instagib.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);
Simple merge
@@@ -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 ;)