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

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

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index 9e5868355991106d4b48cd6feae4171c2903802d..c8d1369f7b42b11363f032163ec8b95eb306dc81 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -239,10 +239,6 @@ float w_hook(float req)
        {
                return self.ammo_cells >= cvar("g_balance_hook_secondary_ammo");
        }
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has run into #'s gravity bomb";
        else if (req == WR_RESETPLAYER)
        {
                self.hook_refire = time;
@@ -265,6 +261,10 @@ float w_hook(float req)
        {
                precache_sound("weapons/hookbomb_impact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "has run into #'s gravity bomb";
        return TRUE;
 }
 #endif