Merge branch 'master' into fruitiex/newpanelhud

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

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index 5879b00b8c029a9ddb516d8e7fc5ae9c65108559..245ad652f6d8bb33eab902171e4975c7580195af 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -126,15 +126,6 @@ float w_uzi(float req)
                return self.ammo_nails >= cvar("g_balance_uzi_first_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_nails >= cvar("g_balance_uzi_first_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "was sniped by";
-               else
-                       w_deathtypestring = "was riddled full of holes by";
-       }
        return TRUE;
 };
 #endif
@@ -160,6 +151,15 @@ float w_uzi(float req)
                precache_sound("weapons/ric2.wav");
                precache_sound("weapons/ric3.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "did the impossible";
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "was sniped by";
+               else
+                       w_deathtypestring = "was riddled full of holes by";
+       }
        return TRUE;
 }
 #endif