Merge remote-tracking branch 'origin/master' into samual/weapons

[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 cb4159f139fa51bf6a7e4a40fb9365a655665719..482b3180a0078222670860bf9fcb2eec018b509a 100644 (file)
--- a/qcsrc/server/weapons/selection.qc
+++ b/qcsrc/server/weapons/selection.qc
@@ -75,10 +75,6 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                        if(autocvar_g_showweaponspawns)
                        {
                                entity e;
-                               string s;
-
-                               e = get_weaponinfo(wpn);
-                               s = e.model2;
 
                                for(e = world; (e = findfloat(e, weapon, wpn)); )
                                {
@@ -87,7 +83,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                                        if(!(e.flags & FL_ITEM))
                                                continue;
                                        WaypointSprite_Spawn(
-                                               s,
+                                               (get_weaponinfo(wpn)).wpmodel,
                                                1, 0,
                                                world, e.origin,
                                                self, 0,