Merge branch 'master' into mirceakitsune/universal_reload_system

[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 4e9a2cd706d91b359c60f37dd0e92f079add2162..d8a418ebb06c9931730e6ec80c0e372ec414390b 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -7,6 +7,12 @@ 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)
@@ -270,7 +276,10 @@ float w_porto(float req)
                precache_sound ("porto/unsupported.wav");
        }
        else if (req == WR_SETUP)
+       {
                weapon_setup(WEP_PORTO);
+               W_Porto_SetAmmoCounter();
+       }
        else if (req == WR_RESETPLAYER)
        {
                self.porto_current = world;