r67 - trunk/basezym/progsqc

[DONOTREPLY at icculus.org]

Author: Vermeulen
Date: 2007-07-11 10:24:59 -0400 (Wed, 11 Jul 2007)
New Revision: 67

Modified:
   trunk/basezym/progsqc/inventory.qc
   trunk/basezym/progsqc/player.qc
Log:
Added items

Modified: trunk/basezym/progsqc/inventory.qc
===================================================================
--- trunk/basezym/progsqc/inventory.qc	2007-07-09 19:24:06 UTC (rev 66)
+++ trunk/basezym/progsqc/inventory.qc	2007-07-11 14:24:59 UTC (rev 67)
@@ -249,7 +249,7 @@
 	else if (itemtype < ITEMTYPE_TOTAL)
 	{
 	 	string wname;
-		wname = strcat("g_weap",ftos(itemtype - ITEMTYPE_WEAP1_AMMO));
+		wname = strcat("g_weap",ftos(itemtype - ITEMTYPE_WEAP1_AMMO + 1));
 		iteminfo_name = cvar_string(wname,"_ammo_name");
 		iteminfo_model = cvar_string(wname,"_ammo_model");
 		iteminfo_pickupsound = cvar_string(wname,"_ammo_ammo_pickupsound");
@@ -521,6 +521,7 @@
 	if (vlen(self.velocity) > 10)
 		return;
 	sound(other, CHAN_AUTO, self.noise, 1, ATTN_NORM);
+	bprint(self.netname,"\n");
 	Inventory_AddFromInventory(other, self);
 	remove(self);
 };
@@ -551,6 +552,69 @@
 	// NOTE: should match viewweapon_animframefunc WS_TURNON code
 };
 
+void() weapon_weap1 =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP1,1,100,100,self.origin,'0 0 0',1,world);
+}
+
+void() weapon_weap2 =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP2,1,100,100,self.origin,'0 0 0',1,world);
+}
+
+void() weapon_weap3 =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP3,1,100,100,self.origin,'0 0 0',1,world);
+}
+
+void() weapon_weap4 =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP4,1,100,100,self.origin,'0 0 0',1,world);
+}
+
+void() weapon_weap5 =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP5,1,100,100,self.origin,'0 0 0',1,world);
+}
+
+void() weapon_weap6 =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP6,1,100,100,self.origin,'0 0 0',1,world);
+}
+
+void() weapon_weap7 =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP7,1,100,100,self.origin,'0 0 0',1,world);
+}
+
+void() item_wep1ammo =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP1_AMMO,1,100,100,self.origin,'0 0 0',1,world);
+}
+void() item_wep2ammo =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP2_AMMO,1,100,100,self.origin,'0 0 0',1,world);
+}
+void() item_wep3ammo =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP3_AMMO,1,100,100,self.origin,'0 0 0',1,world);
+}
+void() item_wep4ammo =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP4_AMMO,1,100,100,self.origin,'0 0 0',1,world);
+}
+void() item_wep5ammo =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP5_AMMO,1,100,100,self.origin,'0 0 0',1,world);
+}
+void() item_wep6ammo =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP6_AMMO,1,100,100,self.origin,'0 0 0',1,world);
+}
+void() item_wep7ammo =
+{
+ 	Item_Spawn(ITEMTYPE_WEAP7_AMMO,1,100,100,self.origin,'0 0 0',1,world);
+}
 /*
 // _x = quantity, _y = ammo type, _z = ammo quantity
 .vector inventory_weap1;

Modified: trunk/basezym/progsqc/player.qc
===================================================================
--- trunk/basezym/progsqc/player.qc	2007-07-09 19:24:06 UTC (rev 66)
+++ trunk/basezym/progsqc/player.qc	2007-07-11 14:24:59 UTC (rev 67)
@@ -42,7 +42,7 @@
 	local vector legsframesoffset;
 
 
-	pc = playerclass_spawn(ACTORTYPE_THEPLAYER, AITYPE_PLAYER, "models/players/soldier", ".md3", "player");
+	pc = playerclass_spawn(ACTORTYPE_THEPLAYER, AITYPE_PLAYER, "models/players/spy", ".md3", "player");
 	pc.health = PLAYER_HEALTH_START;
 	pc.max_health = PLAYER_HEALTH_MAX;
 	pc.armorvalue = PLAYER_SHIELD_START;