Merge remote branch 'origin/divVerent/fruitbalance' into fruitiex/fruitbalance

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

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index c23a47b5d668fbe1b000321698f4404e5dcc260d..aee2a80a28e1aad32baa97fb357db263ae8cdb26 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -74,10 +74,6 @@ float w_nex(float req)
                return self.ammo_cells >= cvar("g_balance_nex_ammo");
        else if (req == WR_CHECKAMMO2)
                return FALSE;
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has been vaporized by";
        return TRUE;
 };
 #endif
@@ -96,6 +92,10 @@ float w_nex(float req)
        {
                precache_sound("weapons/neximpact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "%s did the impossible";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "%s has been vaporized by %s";
        return TRUE;
 }
 #endif