Fix the placeholders %y, %l, %d (used in chat to find the nearest weapons/powerups...

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

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 512eb28e8ca1800407a4c838cc02c175d363c805..c347648dff324c5300e837630fa197b1be17992d 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -140,12 +140,6 @@ float w_shotgun(float req)
                return self.ammo_shells >= cvar("g_balance_shotgun_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_shells >= cvar("g_balance_shotgun_secondary_ammo") * 3;
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-       {
-               w_deathtypestring = "was gunned by"; // unchecked: SECONDARY
-       }
        return TRUE;
 };
 #endif
@@ -173,6 +167,12 @@ float w_shotgun(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)
+       {
+               w_deathtypestring = "was gunned by"; // unchecked: SECONDARY
+       }
        return TRUE;
 }
 #endif