Merge remote branch 'refs/remotes/origin/fruitiex/outofammosound'

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

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 5fe75ab2ca46bfbdfa0828b564b68aa419e8c060..9abb8a7a0200f76e63a5ecbe6b2ddeb2d19e7652 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -207,10 +207,6 @@ float w_hlac(float req)
                return self.ammo_cells >= cvar("g_balance_hlac_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_cells >= cvar("g_balance_hlac_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "should have used a smaller gun";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "was cut down by";
        return TRUE;
 };
 #endif
@@ -229,6 +225,10 @@ float w_hlac(float req)
        {
                precache_sound("weapons/laserimpact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "%s should have used a smaller gun";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "%s was cut down by %s";
        return TRUE;
 }
 #endif