From ac6c3fbdb4a2484e7ba1e38e8ce45ee1abdba498 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 18 Dec 2008 07:48:05 +0000 Subject: [PATCH] now the weapon icon showing REALLY works git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5259 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_weaponsystem.qc | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 1b2587e21..906d71d26 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -373,11 +373,18 @@ void CL_SpawnWeaponentity() self.exteriorweaponentity.nextthink = time; }; +.float hasweapon_complain_spam; + float client_hasweapon(entity cl, float wpn, float andammo, float complain) { local float weaponbit, f; local entity oldself; + if(time < self.hasweapon_complain_spam) + complain = 0; + if(complain) + self.hasweapon_complain_spam = time + 0.2; + if (wpn < WEP_FIRST || wpn > WEP_LAST) { if (complain) @@ -421,6 +428,11 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) if(cvar("g_showweaponspawns")) { entity e; + string s; + + e = get_weaponinfo(wpn); + s = e.model2; + for(e = world; (e = findfloat(e, weapons, weaponbit)); ) { if(e.classname == "droppedweapon") @@ -428,7 +440,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) if not(e.flags & FL_ITEM) continue; WaypointSprite_Spawn( - e.model2, + s, 1, 0, world, e.origin, self, 0, -- 2.39.2