[nexuiz-commits] r6220 - in trunk/data/qcsrc/server: . tturrets/units

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-19 08:14:30 -0400 (Thu, 19 Mar 2009)
New Revision: 6220

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/tturrets/units/unit_common.qc
   trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
   trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
Log:
make turrets work again


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-03-19 11:14:41 UTC (rev 6219)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-03-19 12:14:30 UTC (rev 6220)
@@ -2113,3 +2113,14 @@
 {
 	e.movetype = MOVETYPE_NONE;
 }
+
+entity gettaginfo_relative_ent;
+vector gettaginfo_relative(entity e, float tag)
+{
+	if(!gettaginfo_relative_ent)
+		gettaginfo_relative_ent = spawn();
+	gettaginfo_relative_ent.model = e.model;
+	gettaginfo_relative_ent.modelindex = e.modelindex;
+	gettaginfo_relative_ent.frame = e.frame;
+	return gettaginfo(gettaginfo_relative_ent, tag);
+}

Modified: trunk/data/qcsrc/server/tturrets/units/unit_common.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_common.qc	2009-03-19 11:14:41 UTC (rev 6219)
+++ trunk/data/qcsrc/server/tturrets/units/unit_common.qc	2009-03-19 12:14:30 UTC (rev 6220)
@@ -8,17 +8,17 @@
         return 0;
 
     f = gettagindex(self,"tag_head");
-    v = gettaginfo(self,f);
+    v = gettaginfo_relative(self,f);
     v = v + self.origin;
     setorigin(self.tur_head,v);
 
     f = gettagindex(self.tur_head,"tag_fire");
-    v = gettaginfo(self.tur_head,f) + (self.tur_head.origin - self.origin);
+    v = gettaginfo_relative(self.tur_head,f) + (self.tur_head.origin - self.origin);
     v_y *= -1;
     self.tur_shotorg = v;
 
     f = gettagindex(self.tur_head,"tag_aim");
-    v = gettaginfo(self.tur_head,f) + (self.tur_head.origin - self.origin);
+    v = gettaginfo_relative(self.tur_head,f) + (self.tur_head.origin - self.origin);
     self.tur_aimorg  = v;
 
     return 1;
@@ -30,12 +30,12 @@
     float f;
 
     f = gettagindex(self.tur_head,"tag_fire");
-    v = gettaginfo(self.tur_head,f) + (self.tur_head.origin - self.origin);
+    v = gettaginfo_relative(self.tur_head,f) + (self.tur_head.origin - self.origin);
     v_y *= -1;
     self.tur_shotorg = v;
 
     f = gettagindex(self.tur_head,"tag_aim");
-    v = gettaginfo(self.tur_head,f) + (self.tur_head.origin - self.origin);
+    v = gettaginfo_relative(self.tur_head,f) + (self.tur_head.origin - self.origin);
     self.tur_aimorg  = v;
 
     return 1;

Modified: trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc	2009-03-19 11:14:41 UTC (rev 6219)
+++ trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc	2009-03-19 12:14:30 UTC (rev 6220)
@@ -29,7 +29,7 @@
     for (i=0;i<1;++i)
     {
         f = gettagindex(self.tur_head,"tag_fire");
-        v = gettaginfo(self.tur_head,f);
+        v = gettaginfo_relative(self.tur_head,f);
         v_y = v_y * -1;
         self.tur_shotorg = v;
         turret_do_updates(self);
@@ -292,7 +292,7 @@
     vector v;
     float f;
     f = gettagindex(self.tur_head,"tag_fire");
-    v = gettaginfo(self.tur_head,f);
+    v = gettaginfo_relative(self.tur_head,f);
     v_y = v_y * -1;
 
     //setsize(self,WALKER_MIN,WALKER_MAX);

Modified: trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_walker.qc	2009-03-19 11:14:41 UTC (rev 6219)
+++ trunk/data/qcsrc/server/tturrets/units/unit_walker.qc	2009-03-19 12:14:30 UTC (rev 6220)
@@ -369,7 +369,7 @@
     else
         f = gettagindex(self.owner,"tag_rocket02");
 
-    org = self.owner.origin + gettaginfo(self.owner,f);
+    org = self.owner.origin + gettaginfo_relative(self.owner,f);
 
     self.nextthink = time + 0.2;
     oldself = self;
@@ -711,7 +711,7 @@
     vector v;
     float f;
     f = gettagindex(self.tur_head,"tag_fire");
-    v = gettaginfo(self.tur_head,f);
+    v = gettaginfo_relative(self.tur_head,f);
     v_y = v_y * -1;
 
     setsize(self,WALKER_MIN,WALKER_MAX);