r130 - trunk/progsqc

[DONOTREPLY at icculus.org]

Author: vermeulen
Date: 2008-10-20 11:05:46 -0400 (Mon, 20 Oct 2008)
New Revision: 130

Modified:
   trunk/progsqc/actor.qc
   trunk/progsqc/bots.qc
   trunk/progsqc/inventory.qc
   trunk/progsqc/player.qc
Log:
It should now only call getiteminfo for weapon changes, and firing
rather than before, where it would call it about 60 times a second

Modified: trunk/progsqc/actor.qc
===================================================================
--- trunk/progsqc/actor.qc	2008-10-20 14:40:51 UTC (rev 129)
+++ trunk/progsqc/actor.qc	2008-10-20 15:05:46 UTC (rev 130)
@@ -271,7 +271,7 @@
 	oldself = self;
 	self = self.owner;
 	
-	Inventory_GetItemInfo(self, self.weaponitem);
+	//Inventory_GetItemInfo(self, self.weaponitem);  YEAH!!!
 	if (animdone)
 	{
 		if (self.weaponstate == WS_LOWER)
@@ -350,7 +350,7 @@
 		return;
 	oldself = self;
 	self = self.owner;
-	Inventory_GetItemInfo(self, self.weaponitem);
+	//Inventory_GetItemInfo(self, self.weaponitem); YEAH!!!!
 	anim_start(self.actorpart_torso, self.playerclass.actoranim_TORSO_STAND, ANIMTYPE_IDLE, torso_animframefunc);
 	self = oldself;
 };
@@ -358,7 +358,7 @@
 void(float newstate) weapon_state =
 {
 	self.weaponstate = newstate;
-	Inventory_GetItemInfo(self, self.weaponitem);
+	//Inventory_GetItemInfo(self, self.weaponitem);
 		   
 	if (newstate == WS_IDLE)
 	{
@@ -381,6 +381,7 @@
 		self.viewmodelchange = self.viewmodelchange + self.iteminfo_ammo1viewmodelpush;
 		self.viewmodelchange_y = self.viewmodelchange_y + crandom();
 		//bprint("weapon_state ");bprint(ftos(newstate));bprint(":");bprint(vtos(self.iteminfo_weapon_viewmodelanim_fire1));bprint(" ");bprint(ftos(self.actorpart_torso.anim_frametime));bprint("\n");
+		Inventory_GetItemInfo(self, self.weaponitem);
 		weapon_fire(FALSE);
 	}
 	else if (newstate == WS_FIRE2)
@@ -388,13 +389,14 @@
 		anim_start(self.actorpart_viewweapon, self.iteminfo_weapon_viewmodelanim_fire2, ANIMTYPE_IDLE, viewweapon_animframefunc);
 		anim_start(self.actorpart_torso, self.playerclass.actoranim_TORSO_ATTACK, ANIMTYPE_IDLE, torso_animframefunc);
 		self.viewmodelchange = self.viewmodelchange + self.iteminfo_ammo2viewmodelpush;
+		Inventory_GetItemInfo(self, self.weaponitem);
 		weapon_fire(TRUE);
 	}
 	else if (newstate == WS_FIRE3)
 	{
-	 	Inventory_GetItemInfo(self, self.itemselected);
-		anim_start(self.actorpart_torso, self.playerclass.actoranim_TORSO_ATTACK, ANIMTYPE_IDLE, torso_animframefunc);
-		weapon_fire(FALSE);
+	 	//Inventory_GetItemInfo(self, self.itemselected);
+		//anim_start(self.actorpart_torso, self.playerclass.actoranim_TORSO_ATTACK, ANIMTYPE_IDLE, torso_animframefunc);
+		//weapon_fire(FALSE);
 	}
 	else if (newstate == WS_RELOAD)
 	{

Modified: trunk/progsqc/bots.qc
===================================================================
--- trunk/progsqc/bots.qc	2008-10-20 14:40:51 UTC (rev 129)
+++ trunk/progsqc/bots.qc	2008-10-20 15:05:46 UTC (rev 130)
@@ -156,7 +156,7 @@
 			}
 
 			//Inventory_GetItemInfo(self, self.itemselected);
-			//if (iteminfo_ammo1fireflags & FIREFLAG_JETPACK)
+			//if (character.iteminfo_ammo1fireflags & FIREFLAG_JETPACK)
 			//{
 			//	self.button7 = 1;
 			//}
@@ -170,7 +170,7 @@
 			if (!self.weapon_canfire1)
 			if (!self.weapon_canfire2)
 			{
-				//if (iteminfo_weapon_canreload)
+				//if (character.iteminfo_weapon_canreload)
 				//	self.button4 = 1;
 				//else
 					self.switchweaponitem = Inventory_GetBestWeapon(self);

Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc	2008-10-20 14:40:51 UTC (rev 129)
+++ trunk/progsqc/inventory.qc	2008-10-20 15:05:46 UTC (rev 130)
@@ -159,7 +159,7 @@
 	local vector item;
 	local entity e;
 	local float d;
-	//bprint(character.iteminfo_name," : ",ftos(itemtype)," : ",character.model,"\n");
+	//bprint(ftos(itemtype)," : ",character.model,"\n");
 	if (itemtype < 0)
 	{
 	    bprint(character.iteminfo_name);

Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc	2008-10-20 14:40:51 UTC (rev 129)
+++ trunk/progsqc/player.qc	2008-10-20 15:05:46 UTC (rev 130)
@@ -290,7 +290,7 @@
 	player_selectlegsanim(TRUE);
 	anim_start(self.actorpart_torso, self.playerclass.actoranim_TORSO_STAND, ANIMTYPE_IDLE, torso_animframefunc);
 	
-	self.itemselected = Inventory_GetBestItem(self);
+	//self.itemselected = Inventory_GetBestItem(self);
 	weapon_setup(self, Inventory_GetBestWeapon(self));
 };
 
@@ -521,7 +521,7 @@
 	   self.viewmodelchange_y = self.viewmodelchange_y - (self.movement_y / 1000);
 	   self.viewmodelchange_z = self.viewmodelchange_z - (self.velocity_z / 2000);
 	
-	   Inventory_GetItemInfo(self, self.weaponitem);
+	   //Inventory_GetItemInfo(self, self.weaponitem);
 	   self.viewmodeldiff = self.iteminfo_viewmodeloffset - self.viewmodelchange;
 	   self.viewmodelchange = self.viewmodelchange + self.viewmodeldiff * 0.1;
 	   actor_setviewmodeloffset(self.viewmodelchange);
@@ -529,12 +529,13 @@
 
 	if (self.flags & FL_CLIENT)
 	{
-		Inventory_GetItemInfo(self, self.itemselected);
-		Inventory_ModifyItem(self, self.itemselected, 0 + self.iteminfo_rechargerate, 0);
-		Inventory_GetItemInfo(self, self.weaponitem);
+		//Inventory_GetItemInfo(self, self.itemselected);
+		//Inventory_ModifyItem(self, self.itemselected, 0 + self.iteminfo_rechargerate, 0);
+		//Inventory_GetItemInfo(self, self.weaponitem);
 		Inventory_ModifyItem(self, self.weaponitem, 0, 0 + self.iteminfo_rechargerate);
 	}
 
+	/*
 	if (self.button7)
 	{
 	 	Inventory_GetItemInfo(self, self.itemselected);
@@ -562,7 +563,7 @@
 		    Inventory_ModifyItem(self, self.itemselected, 0 - self.iteminfo_ammo1minimumtofire, 0);
 			self.invisactive = TRUE;
 		}
-	}
+	} */
 	
 	if (self.flags & FL_CLIENT) // only real players can respawn, not NPCs
 	if (self.deadflag)
@@ -610,7 +611,7 @@
 	{
 	   	if (self.button4)
 		{
-		    Inventory_GetItemInfo(self, self.weaponitem);
+		    //Inventory_GetItemInfo(self, self.weaponitem);
 		   	if (self.iteminfo_ammo1fireflags & FIREFLAG_ZOOM)
 		       self.viewzoom = 0.2;
 		}
@@ -1407,6 +1408,7 @@
 	}
 	if (impuls == 13)
 	{
+		/*
 		w = self.itemselected;
 		while (TRUE)
 		{
@@ -1422,7 +1424,7 @@
 				self.itemselected = w;
 				break;
 			}
-		}
+		} */
 	}
 };