[nexuiz-commits] r8652 - in trunk/data/qcsrc/server: tturrets/units vehicles
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Feb 18 16:28:25 EST 2010
Author: tzork
Date: 2010-02-18 16:28:24 -0500 (Thu, 18 Feb 2010)
New Revision: 8652
Modified:
trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
trunk/data/qcsrc/server/vehicles/racer.qc
trunk/data/qcsrc/server/vehicles/spiderbot.qc
Log:
Better "drop to ground" for vehicles and moving turrets.
Modified: trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2010-02-16 18:09:19 UTC (rev 8651)
+++ trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2010-02-18 21:28:24 UTC (rev 8652)
@@ -176,9 +176,9 @@
self.angles_x = anglemods(self.angles_x);
self.angles_y = anglemods(self.angles_y);
- self.angles_x *= -1;
- makevectors(self.angles);
- self.angles_x *= -1;
+ //self.angles_x *= -1;
+ fixedmakevectors(self.angles);
+ //self.angles_x *= -1;
wish_angle = normalize(self.steerto);
wish_angle = vectoangles(wish_angle);
Modified: trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2010-02-16 18:09:19 UTC (rev 8651)
+++ trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2010-02-18 21:28:24 UTC (rev 8652)
@@ -369,9 +369,9 @@
entity rocket;
- self.angles_x *= -1;
- makevectors(self.angles);
- self.angles_x *= -1;
+ //self.angles_x *= -1;
+ fixedmakevectors(self.angles);
+ //self.angles_x *= -1;
te_explosion (org);
@@ -586,9 +586,9 @@
void walker_postthink()
{
- self.angles_x *= -1;
- makevectors(self.angles);
- self.angles_x *= -1;
+ //self.angles_x *= -1;
+ fixedmakevectors(self.angles);
+ //self.angles_x *= -1;
if ((self.spawnflags & TSF_NO_PATHBREAK) && self.pathcurrent)
walker_move_path();
@@ -718,9 +718,7 @@
return;
}
-
self.damage_flags |= TFL_DMG_DEATH_NOGIBS;
-
self.target_select_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_LOS;
self.target_validate_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_LOS;
@@ -737,7 +735,8 @@
setsize(self, WALKER_MIN, WALKER_MAX);
setorigin(self,self.origin);
- traceline(self.origin + '0 0 128', self.origin - '0 0 10000', MOVE_NORMAL, self);
+ //traceline(self.origin + '0 0 128', self.origin - '0 0 10000', MOVE_NORMAL, self);
+ tracebox(self.origin + '0 0 128', self.mins,self.maxs,self.origin - '0 0 10000', MOVE_NORMAL, self);
setorigin(self.wkr_spawn, trace_endpos + '0 0 4');
setorigin(self, self.wkr_spawn.origin);
Modified: trunk/data/qcsrc/server/vehicles/racer.qc
===================================================================
--- trunk/data/qcsrc/server/vehicles/racer.qc 2010-02-16 18:09:19 UTC (rev 8651)
+++ trunk/data/qcsrc/server/vehicles/racer.qc 2010-02-18 21:28:24 UTC (rev 8652)
@@ -769,6 +769,9 @@
void racer_dinit()
{
+ tracebox(self.origin + '0 0 100', RACER_MIN * 0.5, RACER_MAX * 0.5, self.origin - '0 0 10000', MOVE_WORLDONLY, self);
+ setorigin(self,trace_endpos);
+
if (self.netname == "")
self.netname = "Race PoD";
@@ -821,6 +824,7 @@
self.vehicle_flags = VHF_HASSHIELD | VHF_SHIELDREGEN;
+ /*
traceline(self.origin,self.origin - '0 0 2048',MOVE_WORLDONLY,self);
if(trace_startsolid)
{
@@ -833,6 +837,7 @@
return;
}
}
+ */
if(trace_fraction != 1.0)
setorigin(self,trace_endpos + '0 0 128');
Modified: trunk/data/qcsrc/server/vehicles/spiderbot.qc
===================================================================
--- trunk/data/qcsrc/server/vehicles/spiderbot.qc 2010-02-16 18:09:19 UTC (rev 8651)
+++ trunk/data/qcsrc/server/vehicles/spiderbot.qc 2010-02-18 21:28:24 UTC (rev 8652)
@@ -1,5 +1,6 @@
#define spiderbot_MIN '-75 -75 0'
-#define spiderbot_MAX '75 75 100'
+//#define
+const vector spiderbot_MAX = '75 75 100';
#define spiderbot_spawnpnt wkr_spawn
void spiderbot_exit(float eject);
@@ -627,7 +628,7 @@
self.flags |= FL_NOTARGET;
self.vehicle_hudmodel.viewmodelforclient = self;
- setorigin(self,self.spiderbot_spawnpnt.origin);
+ setorigin(self,self.spiderbot_spawnpnt.origin + '0 0 1.25' * spiderbot_MAX_z);
self.angles = self.spiderbot_spawnpnt.angles;
if (self.team == COLOR_TEAM1)
@@ -682,10 +683,16 @@
self.spiderbot_spawnpnt = spawn();
self.spiderbot_spawnpnt.angles = self.angles;
- traceline(self.origin + '0 0 16', self.origin - '0 0 10000', MOVE_WORLDONLY, self);
- setorigin(self.spiderbot_spawnpnt,trace_endpos + '0 0 4');
- setorigin(self,self.spiderbot_spawnpnt.origin);
+ setorigin(self,self.origin);
+ dprint("ORG1:",vtos(self.origin));
+ //traceline(self.origin + '0 0 100', self.origin - '0 0 10000', MOVE_WORLDONLY, self);
+ tracebox(self.origin + '0 0 100', spiderbot_MIN, spiderbot_MAX, self.origin - '0 0 10000', MOVE_WORLDONLY, self);
+ setorigin(self.spiderbot_spawnpnt,trace_endpos);
+ dprint("ORG2:",vtos(self.origin),"\n");
+
+ //setorigin(self.spiderbot_spawnpnt,self.origin);
+
if(self.team && !teamplay)
self.team = 0;
else
More information about the nexuiz-commits
mailing list