Merge branch 'master' into TimePath/features/jetpack_jump

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

diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc
index cf8a1514bbfacb206a83b3ccc0cef924e73fe6ee..12ffbb9b49bd17d2f5f664bd824dc99f97352767 100644 (file)
--- a/qcsrc/server/weapons/selection.qc
+++ b/qcsrc/server/weapons/selection.qc
@@ -85,7 +85,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                                        WaypointSprite_Spawn(
                                                (get_weaponinfo(wpn)).wpmodel,
                                                1, 0,
-                                               world, e.origin,
+                                               world, e.origin + ('0 0 1' * e.maxs_z) * 1.2,
                                                self, 0,
                                                world, enemy,
                                                0,
@@ -253,7 +253,7 @@ void W_SwitchWeapon(float imp)
                else
                        self.selectweapon = imp; // update selectweapon ANYWAY
        }
-       else { WEP_ACTION(self.weapon, WR_RELOAD); }
+       else if(!forbidWeaponUse()) { WEP_ACTION(self.weapon, WR_RELOAD); }
 }
 
 void W_CycleWeapon(string weaponorder, float dir)