r60 - trunk/basezym/progsqc

[DONOTREPLY at icculus.org]

Author: havoc
Date: 2006-09-30 22:51:04 -0400 (Sat, 30 Sep 2006)
New Revision: 60

Modified:
   trunk/basezym/progsqc/player.qc
Log:
fixed bug where players were not getting their weapon_ofs from the
player class, changed granting of starting items to give full inventory
ammo


Modified: trunk/basezym/progsqc/player.qc
===================================================================
--- trunk/basezym/progsqc/player.qc	2006-08-17 01:12:06 UTC (rev 59)
+++ trunk/basezym/progsqc/player.qc	2006-10-01 02:51:04 UTC (rev 60)
@@ -100,22 +100,22 @@
 	Inventory_Clear(pc);
 	Inventory_GetItemInfo(pc, ITEMTYPE_ASSAULTRAILGUN);
 	Inventory_ModifyItem(pc, ITEMTYPE_ASSAULTRAILGUN, 1, iteminfo_ammo1max, iteminfo_ammo2max);
-	Inventory_ModifyItem(pc, ITEMTYPE_ASSAULTRAILGUN_AMMO, iteminfo_ammo1max * 2, 0, 0);
+	Inventory_ModifyItem(pc, ITEMTYPE_ASSAULTRAILGUN_AMMO, iteminfo_ammo1inventorymax * 2, 0, 0);
 	Inventory_GetItemInfo(pc, ITEMTYPE_CRYLINK);
 	Inventory_ModifyItem(pc, ITEMTYPE_CRYLINK, 1, iteminfo_ammo1max, iteminfo_ammo2max);
-	Inventory_ModifyItem(pc, ITEMTYPE_CRYLINK_AMMO, iteminfo_ammo1max * 2, 0, 0);
+	Inventory_ModifyItem(pc, ITEMTYPE_CRYLINK_AMMO, iteminfo_ammo1inventorymax * 2, 0, 0);
 	Inventory_GetItemInfo(pc, ITEMTYPE_HAGAR);
 	Inventory_ModifyItem(pc, ITEMTYPE_HAGAR, 1, iteminfo_ammo1max, iteminfo_ammo2max);
-	Inventory_ModifyItem(pc, ITEMTYPE_HAGAR_AMMO, iteminfo_ammo1max * 2, 0, 0);
+	Inventory_ModifyItem(pc, ITEMTYPE_HAGAR_AMMO, iteminfo_ammo1inventorymax * 2, 0, 0);
 	Inventory_GetItemInfo(pc, ITEMTYPE_MINIGUN);
 	Inventory_ModifyItem(pc, ITEMTYPE_MINIGUN, 1, iteminfo_ammo1max, iteminfo_ammo2max);
-	Inventory_ModifyItem(pc, ITEMTYPE_MINIGUN_AMMO, iteminfo_ammo1max * 2, 0, 0);
+	Inventory_ModifyItem(pc, ITEMTYPE_MINIGUN_AMMO, iteminfo_ammo1inventorymax * 2, 0, 0);
 	Inventory_GetItemInfo(pc, ITEMTYPE_RPG);
 	Inventory_ModifyItem(pc, ITEMTYPE_RPG, 1, iteminfo_ammo1max, iteminfo_ammo2max);
-	Inventory_ModifyItem(pc, ITEMTYPE_RPG_AMMO, iteminfo_ammo1max * 2, 0, 0);
+	Inventory_ModifyItem(pc, ITEMTYPE_RPG_AMMO, iteminfo_ammo1inventorymax * 2, 0, 0);
 	Inventory_GetItemInfo(pc, ITEMTYPE_SNIPERRAILGUN);
 	Inventory_ModifyItem(pc, ITEMTYPE_SNIPERRAILGUN, 1, iteminfo_ammo1max, iteminfo_ammo2max);
-	Inventory_ModifyItem(pc, ITEMTYPE_SNIPERRAILGUN_AMMO, iteminfo_ammo1max * 2, 0, 0);
+	Inventory_ModifyItem(pc, ITEMTYPE_SNIPERRAILGUN_AMMO, iteminfo_ammo1inventorymax * 2, 0, 0);
 
 	/*
 	pc = playerclass_spawn(ACTORTYPE_THEPLAYER, AITYPE_PLAYER, "models/players/spy", ".md3", "player");
@@ -292,6 +292,7 @@
 	if (!pc)
 		objerror("No playerclass found");
 	self.playerclass = pc;
+	self.weapon_ofs = pc.weapon_ofs;
 	self.view_ofs = pc.view_ofs;
 	self.aitype = pc.aitype;
 	self.health = pc.health;