Merge branch 'master' into mirceakitsune/multijump

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

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index d5c0b13f950fcc72542db32c4cd6a11c917ba122..368faecbf3b9c340fb945a673102e20e31ba2f97 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -351,41 +351,6 @@ float w_fireball(float req)
                return self.ammo_fuel >= cvar("g_balance_fireball_primary_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_fuel >= cvar("g_balance_fireball_secondary_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "forgot about some firemine";
-               else
-                       w_deathtypestring = "should have used a smaller gun";
-       }
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-               {
-                       if(w_deathtype & HITTYPE_HEADSHOT)
-                               w_deathtypestring = "tried to catch #'s firemine";
-                       else
-                               w_deathtypestring = "fatefully ignored #'s firemine";
-               }
-               else
-               {
-                       if(w_deathtype & HITTYPE_BOUNCE)
-                       {
-                               if(w_deathtype & HITTYPE_SPLASH) // BFG effect
-                               {
-                                       w_deathtypestring = "could not hide from #'s fireball";
-                               }
-                               else // laser
-                               {
-                                       w_deathtypestring = "saw the pretty lights of #'s fireball";
-                               }
-                       }
-                       else if(w_deathtype & HITTYPE_SPLASH)
-                               w_deathtypestring = "got too close to #'s fireball";
-                       else
-                               w_deathtypestring = "tasted #'s fireball";
-               }
-       }
        else if (req == WR_RESETPLAYER)
        {
                self.fireball_primarytime = time;
@@ -416,6 +381,37 @@ float w_fireball(float req)
                precache_sound("weapons/fireball_impact.wav");
                precache_sound("weapons/fireball_impact2.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "%s forgot about some firemine";
+               else
+                       w_deathtypestring = "%s should have used a smaller gun";
+       }
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+               {
+                       if(w_deathtype & HITTYPE_HEADSHOT)
+                               w_deathtypestring = "%s tried to catch %s's firemine";
+                       else
+                               w_deathtypestring = "%s fatefully ignored %s's firemine";
+               }
+               else
+               {
+                       if(w_deathtype & HITTYPE_BOUNCE)
+                       {
+                               if(w_deathtype & HITTYPE_SPLASH) // BFG effect
+                                       w_deathtypestring = "%s could not hide from %s's fireball";
+                               else // laser
+                                       w_deathtypestring = "%s saw the pretty lights of %s's fireball";
+                       }
+                       else if(w_deathtype & HITTYPE_SPLASH)
+                               w_deathtypestring = "%s got too close to %s's fireball";
+                       else
+                               w_deathtypestring = "%s tasted %s's fireball";
+               }
+       }
        return TRUE;
 }
 #endif