r5258 - in trunk/data/qcsrc: common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-18 02:39:10 -0500 (Thu, 18 Dec 2008)
New Revision: 5258

Modified:
   trunk/data/qcsrc/common/items.qc
   trunk/data/qcsrc/common/items.qh
   trunk/data/qcsrc/server/cl_weaponsystem.qc
Log:
fix showweaponspawns


Modified: trunk/data/qcsrc/common/items.qc
===================================================================
--- trunk/data/qcsrc/common/items.qc	2008-12-18 07:01:39 UTC (rev 5257)
+++ trunk/data/qcsrc/common/items.qc	2008-12-18 07:39:10 UTC (rev 5258)
@@ -16,6 +16,7 @@
 	e.mdl = modelname;
 	e.model = strzone(strcat("models/weapons/g_", modelname, ".md3"));
 	e.spawnflags = 0;
+	e.model2 = strzone(strcat("wpn-", e.mdl));
 	if(normalweapon)
 		e.spawnflags |= WEPSPAWNFLAG_NORMAL;
 	if(canclimb)
@@ -43,6 +44,7 @@
 	dummy_weapon_info.spawnflags = 0;
 	dummy_weapon_info.impulse = -1;
 	dummy_weapon_info.bot_pickupbasevalue = 0;
+	dummy_weapon_info.model2 = "";
 
 	float i;
 	weaponpriority_hudselector_0 = "";

Modified: trunk/data/qcsrc/common/items.qh
===================================================================
--- trunk/data/qcsrc/common/items.qh	2008-12-18 07:01:39 UTC (rev 5257)
+++ trunk/data/qcsrc/common/items.qh	2008-12-18 07:39:10 UTC (rev 5258)
@@ -75,3 +75,4 @@
 .float spawnflags; // WEPSPAWNFLAG_... combined
 .float impulse; // weapon impulse
 .float bot_pickupbasevalue; // bot weapon priority
+.string model2; // wpn- sprite name

Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-12-18 07:01:39 UTC (rev 5257)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-12-18 07:39:10 UTC (rev 5258)
@@ -418,13 +418,9 @@
 		{
 			sprint(cl, strcat("You do not have the ^2", W_Name(wpn), "\n") );
 
-			entity e;
-			string s;
-
 			if(cvar("g_showweaponspawns"))
 			{
-				e = get_weaponinfo(wpn);
-				s = strcat("wpn-", e.mdl);
+				entity e;
 				for(e = world; (e = findfloat(e, weapons, weaponbit)); )
 				{
 					if(e.classname == "droppedweapon")
@@ -432,7 +428,7 @@
 					if not(e.flags & FL_ITEM)
 						continue;
 					WaypointSprite_Spawn(
-						s,
+						e.model2,
 						1, 0,
 						world, e.origin,
 						self, 0,