Merge branch 'terencehill/ca_arena_mutators' of git://git.xonotic.org/xonotic/xonotic...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_minstanex.qc

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index aa85079052a933081b0b11e20b737c1919196628..0a76265d7a2847c54e6eca6ea031751255112abc 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -15,7 +15,9 @@ void W_MinstaNex_Attack (void)
        yoda = 0;
        damage_goodhits = 0;
        headshot = 0;
+       damage_headshotbonus = -1; // no extra damage, just count
        FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, 10000, 800, 0, 0, 0, 0, WEP_MINSTANEX);
+       damage_headshotbonus = 0;
 
        if(g_minstagib)
        {
@@ -32,8 +34,8 @@ void W_MinstaNex_Attack (void)
                }
                if(damage_goodhits && self.minstanex_lasthit)
                {
-                       if(AnnounceTo(self, "impressive"))
-                               damage_goodhits = 0; // only every second time
+                       AnnounceTo(self, "impressive");
+                       damage_goodhits = 0; // only every second time
                }
        }
 
@@ -102,8 +104,9 @@ void minstagib_ammocheck(void)
                minstagib_stop_countdown(self);
        else if (self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO))
        {
+               if (self.minstagib_needammo)
+                       self.health = 100;
                minstagib_stop_countdown(self);
-               self.health = 100;
        }
        else
        {