r2410 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Mon Apr 30 09:59:35 EDT 2007


Author: div0
Date: 2007-04-30 09:59:35 -0400 (Mon, 30 Apr 2007)
New Revision: 2410

Modified:
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/t_items.qc
Log:
itemsInMap (Dresk)


Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2007-04-29 22:35:31 UTC (rev 2409)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2007-04-30 13:59:35 UTC (rev 2410)
@@ -279,7 +279,14 @@
 		return TRUE;
 	}
 	if (complain)
-		sprint(self, "You don't own that weapon\n");
+	{
+		// DRESK - 3/16/07
+		// Report Proper Weapon Status / Modified Weapon Ownership Message
+		if(itemsInMap & itemcode)
+			sprint(self, strcat("You do not have the ^2", W_Name(wpn), "\n") );
+		else
+			sprint(self, strcat("The ^2", W_Name(wpn), "^7 is ^1NOT AVAILABLE^7 in this map\n") );
+	}
 	return FALSE;
 };
 

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2007-04-29 22:35:31 UTC (rev 2409)
+++ trunk/data/qcsrc/server/defs.qh	2007-04-30 13:59:35 UTC (rev 2410)
@@ -306,6 +306,8 @@
 void FixIntermissionClient(entity e);
 void FixClientCvars(entity e);
 
+float itemsInMap;
+
 void centerprint_atprio(entity e, float prio, string s);
 void centerprint_expire(entity e, float prio);
 void centerprint(entity e, string s);

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2007-04-29 22:35:31 UTC (rev 2409)
+++ trunk/data/qcsrc/server/t_items.qc	2007-04-30 13:59:35 UTC (rev 2410)
@@ -300,6 +300,8 @@
 		}
 
 		waypoint_spawnforitem(self);
+
+		itemsInMap |= itemflags;
 	}
 
 	if (!(cvar("g_pickup_items") && !cvar("g_nixnex")) && !cvar("g_minstagib") &&




More information about the nexuiz-commits mailing list