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

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

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 2824b96d58622b2e04f98fd865a6ff1bc5dbba32..92ed5e75a94888f6414aba480ee475986483533e 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -447,27 +447,27 @@ float w_electro(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "could not remember where they put plasma";
+                       w_deathtypestring = "%s could not remember where they put plasma";
                else
-                       w_deathtypestring = "played with plasma";
+                       w_deathtypestring = "%s played with plasma";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
                {
                        if(w_deathtype & HITTYPE_SPLASH) // unchecked: BOUNCE
-                               w_deathtypestring = "just noticed #'s blue ball";
+                               w_deathtypestring = "%s just noticed %s's blue ball";
                        else // unchecked: BOUNCE
-                               w_deathtypestring = "got in touch with #'s blue ball";
+                               w_deathtypestring = "%s got in touch with %s's blue ball";
                }
                else
                {
                        if(w_deathtype & HITTYPE_BOUNCE) // combo
-                               w_deathtypestring = "felt the electrifying air of #'s combo";
+                               w_deathtypestring = "%s felt the electrifying air of %s's combo";
                        else if(w_deathtype & HITTYPE_SPLASH)
-                               w_deathtypestring = "got too close to #'s blue beam";
+                               w_deathtypestring = "%s got too close to %s's blue beam";
                        else
-                               w_deathtypestring = "was blasted by #'s blue beam";
+                               w_deathtypestring = "%s was blasted by %s's blue beam";
                }
        }
        return TRUE;