Merge remote branch 'origin/fruitiex/fruitbalance'

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

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index 1ab117885b02dde03a068e511da43c681403e366..010a0f8b36546ccf7ad18a47b3460349b3d61a18 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -269,10 +269,6 @@ float w_porto(float req)
        }
        else if (req == WR_SETUP)
                weapon_setup(WEP_PORTO);
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
-       else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "felt # doing the impossible to him";
        else if (req == WR_RESETPLAYER)
        {
                self.porto_current = world;
@@ -291,6 +287,10 @@ float w_porto(float req)
        {
                // nothing to do
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "%s did the impossible";
+       else if (req == WR_KILLMESSAGE)
+               w_deathtypestring = "%s felt %s doing the impossible to him";
        return TRUE;
 }
 #endif