fix a stupid interaction between weapon throwing and weapon load (loaded ammo was...

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

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 4a35f481b57c8a88abf53b714b0f6e2762571e6c..4f496e56ebb7f102ea22f58ea14d53944e49544a 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -607,10 +607,6 @@ void CL_ExteriorWeaponentity_Think()
                }
                else
                        setattachment(self, self.owner, "bip01 r hand");
-
-               // if that didn't find a tag, hide the exterior weapon model
-               if (!self.tag_index)
-                       self.model = "";
        }
        self.effects = self.owner.effects;
        if(sv_pitch_min == sv_pitch_max)
@@ -857,7 +853,7 @@ void weapon_setup(float windex)
        entity e;
        e = get_weaponinfo(windex);
        self.items &~= IT_AMMO;
-       self.items = self.items | e.items;
+       self.items = self.items | (e.items & IT_AMMO);
 
        // the two weapon entities will notice this has changed and update their models
        self.weapon = windex;
@@ -1516,7 +1512,7 @@ void W_Reload(float sent_ammo_min, float sent_ammo_amount, float sent_time, stri
 
        // now begin the reloading process
 
-       sound (self, CH_WEAPON_B, self.reload_sound, VOL_BASE, ATTN_NORM);
+       sound (self, CH_WEAPON_SINGLE, self.reload_sound, VOL_BASE, ATTN_NORM);
 
        // do not set ATTACK_FINISHED in reload code any more. This causes annoying delays if eg: You start reloading a weapon,
        // then quickly switch to another weapon and back. Reloading is canceled, but the reload delay is still there,