Merge branch 'master' into fruitiex/newpanelhud

[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 f28c8581cc5ee3c6fa2550561a6c994f8fcd55a5..65d02dcb2d6422151b971a9b6c47e92cb1aa9e8f 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -232,10 +232,6 @@ float w_minstanex(float req)
        }
        else if (req == WR_CHECKAMMO2)
                return TRUE;
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has been vaporized by";
        else if (req == WR_RESETPLAYER)
        {
                self.minstanex_lasthit = 0;
@@ -258,6 +254,10 @@ float w_minstanex(float req)
        {
                precache_sound("weapons/neximpact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "has been vaporized by";
        return TRUE;
 }
 #endif