[nexuiz-commits] r8206 - in trunk/data/qcsrc/server/tturrets: include system units
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Nov 4 08:17:43 EST 2009
Author: tzork
Date: 2009-11-04 08:17:39 -0500 (Wed, 04 Nov 2009)
New Revision: 8206
Modified:
trunk/data/qcsrc/server/tturrets/include/turrets_early.qh
trunk/data/qcsrc/server/tturrets/system/system_main.qc
trunk/data/qcsrc/server/tturrets/system/system_misc.qc
trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
Log:
Minor turret tweaks.
Modified: trunk/data/qcsrc/server/tturrets/include/turrets_early.qh
===================================================================
--- trunk/data/qcsrc/server/tturrets/include/turrets_early.qh 2009-11-04 13:06:55 UTC (rev 8205)
+++ trunk/data/qcsrc/server/tturrets/include/turrets_early.qh 2009-11-04 13:17:39 UTC (rev 8206)
@@ -5,6 +5,8 @@
#message "with tZork turrets"
+float turret_count;
+
vector real_origin(entity ent);
/// Map time control over pain inflicted
Modified: trunk/data/qcsrc/server/tturrets/system/system_main.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_main.qc 2009-11-04 13:06:55 UTC (rev 8205)
+++ trunk/data/qcsrc/server/tturrets/system/system_main.qc 2009-11-04 13:17:39 UTC (rev 8206)
@@ -927,11 +927,11 @@
* (unless you have a very good reason not to)
* if the return value is 0, the turret should be removed.
*/
-float turret_count;
float turret_stdproc_init (string cvar_base_name, float csqc_shared, string base, string head)
{
entity e,ee;
+
e = find(world, classname, "turret_manager");
if not (e)
{
@@ -960,7 +960,6 @@
if (self.spawnflags & TSF_TERRAINBASE)
{
entity tb;
- //precache_model("models/turrets/terrainbase.md3");
tb = spawn();
setmodel(tb,"models/turrets/terrainbase.md3");
setorigin(tb,self.origin);
@@ -1295,7 +1294,8 @@
self.think = turret_think;
++turret_count;
- self.nextthink = time + self.ticrate + (turret_count * sys_ticrate);
+ self.nextthink = time + 1;
+ self.nextthink += turret_count * sys_ticrate;
self.tur_head.team = self.team;
self.view_ofs = '0 0 0';
Modified: trunk/data/qcsrc/server/tturrets/system/system_misc.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_misc.qc 2009-11-04 13:06:55 UTC (rev 8205)
+++ trunk/data/qcsrc/server/tturrets/system/system_misc.qc 2009-11-04 13:17:39 UTC (rev 8206)
@@ -1,16 +1,19 @@
//--// Some support routines //--//
#define anglemodss(a) (a - floor(a / 360) * 360)
+
float(float v) anglemods =
{
v = v - 360 * floor(v / 360);
return v;
-};
+}
+
float safeangle(float a)
{
- if((a > -361) && (a < 361))
+ if((a >= -360) && (a <= 360))
return a;
+
a -= (360 * floor(a / 360));
return a;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2009-11-04 13:06:55 UTC (rev 8205)
+++ trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2009-11-04 13:17:39 UTC (rev 8206)
@@ -168,7 +168,7 @@
movelib_move_simple(v_forward,cvar("g_turrets_unit_ewheel_speed_slower"),0.4);
}
}
- else if (self.tur_dist_enemy < self.target_range_optimal - 10)
+ else if (self.tur_dist_enemy < self.target_range_optimal * 0.5)
{
self.frame = ewheel_amin_bck_slow;
movelib_move_simple(v_forward * -1,cvar("g_turrets_unit_ewheel_speed_slow"),0.4);
Modified: trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-11-04 13:06:55 UTC (rev 8205)
+++ trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-11-04 13:17:39 UTC (rev 8206)
@@ -866,7 +866,7 @@
vector vtmp;
entity e;
- self.origin = self.wkr_spawn.origin;
+ setorigin(self,self.wkr_spawn.origin);
self.angles = self.wkr_spawn.angles;
vtmp = self.wkr_spawn.origin;
@@ -891,6 +891,7 @@
}
}
}
+
void walker_diehook()
{
turret_trowgib2(self.origin,self.velocity + v_up * 200,'-0.6 -0.2 -02',self,time + random() * 1);
More information about the nexuiz-commits
mailing list