Merge commit 'a5f8cbe456bed48c2c7b5d666e30cbaa344e6e33'

[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 551f30ce0e85c61acd44f9441693e247191e6a52..d6e92a53728203ff5f648e797e2304e00a652fc1 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -7,12 +7,6 @@ REGISTER_WEAPON(PORTO, w_porto, 0, 0, WEP_TYPE_OTHER, 0, "porto" , "porto", _("P
 .float porto_v_angle_held;
 .vector right_vector;
 
-void W_Porto_SetAmmoCounter()
-{
-       // this weapon doesn't have a reload system, so always set the clip to 0 when switching to it
-       self.clip_load = self.clip_size = 0; // also keeps crosshair ammo from displaying
-}
-
 void W_Porto_Success (void)
 {
        if(self.owner == world)
@@ -278,17 +272,12 @@ float w_porto(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_PORTO);
-               W_Porto_SetAmmoCounter();
+               self.current_ammo = ammo_none;
        }
        else if (req == WR_RESETPLAYER)
        {
                self.porto_current = world;
        }
-       else if (req == WR_SWITCHABLE)
-       {
-               // no reloading system, return true
-               return TRUE;
-       }
        return TRUE;
 };
 #endif
@@ -304,9 +293,9 @@ float w_porto(float req)
                // nothing to do
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "%s did the impossible";
+               w_deathtypestring = _("%s did the impossible");
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "%s felt %s doing the impossible to him";
+               w_deathtypestring = _("%s felt %s doing the impossible to him");
        return TRUE;
 }
 #endif