Merge branch 'master' into divVerent/fruitbalance

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

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 7f6062d3f6a65bd262f0278a5b59f1ee31aa2b42..d80317a346ef1a1b3a3be3479b3c67e038133aad 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -220,19 +220,6 @@ float w_crylink(float req)
                return self.ammo_cells >= cvar("g_balance_crylink_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_cells >= cvar("g_balance_crylink_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-       {
-               w_deathtypestring = "succeeded at self-destructing themself with the Crylink";
-       }
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_BOUNCE)
-                       w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be)
-               else if(w_deathtype & HITTYPE_SPLASH)
-                       w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY
-               else
-                       w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY
-       }
        return TRUE;
 };
 #endif
@@ -261,6 +248,19 @@ float w_crylink(float req)
                precache_sound("weapons/crylink_impact2.wav");
                precache_sound("weapons/crylink_impact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+       {
+               w_deathtypestring = "succeeded at self-destructing themself with the Crylink";
+       }
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_BOUNCE)
+                       w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be)
+               else if(w_deathtype & HITTYPE_SPLASH)
+                       w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY
+               else
+                       w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY
+       }
        return TRUE;
 }
 #endif