[nexuiz-commits] r8396 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Dec 16 09:25:36 EST 2009


Author: div0
Date: 2009-12-16 09:25:35 -0500 (Wed, 16 Dec 2009)
New Revision: 8396

Modified:
   trunk/data/qcsrc/server/cl_weaponsystem.qc
Log:
for niceness to MD3 exporters, also support the weapon tag names with a tag_ prefix


Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-12-16 07:36:24 UTC (rev 8395)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-12-16 14:25:35 UTC (rev 8396)
@@ -406,6 +406,8 @@
 				self.weaponentity.model = "";
 			setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // precision set below
 			v_shot_idx = gettagindex(self, "shot"); // used later
+			if(!v_shot_idx)
+				v_shot_idx = gettagindex(self, "tag_shot");
 
 			if(qcweaponanimation)
 			{
@@ -447,6 +449,13 @@
 					setmodel(self.weaponentity, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // precision does not matter
 					setattachment(self.weaponentity, self, "weapon");
 				}
+				else if(gettagindex(self, "tag_weapon"))
+				{
+					if (!self.weaponentity)
+						self.weaponentity = spawn();
+					setmodel(self.weaponentity, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // precision does not matter
+					setattachment(self.weaponentity, self, "tag_weapon");
+				}
 				else
 				{
 					if(self.weaponentity)
@@ -461,6 +470,8 @@
 
 				float idx;
 				idx = gettagindex(self, "shot");
+				if(!idx)
+					idx = gettagindex(self, "tag_shot");
 				if(idx)
 				{
 					self.movedir = gettaginfo(self, idx);
@@ -472,6 +483,8 @@
 				}
 
 				idx = gettagindex(self, "shell");
+				if(!idx)
+					idx = gettagindex(self, "tag_shell");
 				if(idx)
 				{
 					self.spawnorigin = gettaginfo(self, idx);
@@ -489,9 +502,17 @@
 				else
 				{
 					if(self.weaponentity)
+					{
 						idx = gettagindex(self, "weapon");
+						if(!idx)
+							idx = gettagindex(self, "tag_weapon");
+					}
 					else
+					{
 						idx = gettagindex(self, "handle");
+						if(!idx)
+							idx = gettagindex(self, "tag_handle");
+					}
 					if(idx)
 					{
 						self.oldorigin = self.movedir - gettaginfo(self, idx);



More information about the nexuiz-commits mailing list