#if defined(CSQC)
#elif defined(MENUQC)
#elif defined(SVQC)
+ #include "pathlib/utility.qh"
#endif
/**
Uniform pull towards a point
**/
-vector steerlib_pull(entity this, vector point)
+#define steerlib_pull(ent,point) normalize(point - (ent).origin)
+/*vector steerlib_pull(entity this, vector point)
{
return normalize(point - this.origin);
-}
+}*/
/**
Uniform push from a point
vector wander_point;
wander_point = v_forward - oldpoint;
- if (vlen(wander_point) > tresh)
+ if (vdist(wander_point, >, tresh))
return oldpoint;
range = bound(0,range,1);
return normalize(leftwish + rightwish + frontwish);
}
-float beamsweep_badpoint(vector point,float waterok)
-{
- float pc,pc2;
-
- if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)
- return 1;
-
- pc = pointcontents(point);
- pc2 = pointcontents(point - '0 0 1');
-
- switch(pc)
- {
- case CONTENT_SOLID: break;
- case CONTENT_SLIME: break;
- case CONTENT_LAVA: break;
-
- case CONTENT_SKY:
- return 1;
-
- case CONTENT_EMPTY:
- if (pc2 == CONTENT_SOLID)
- return 0;
-
- if (pc2 == CONTENT_WATER)
- if(waterok)
- return 0;
-
- break;
-
- case CONTENT_WATER:
- if(waterok)
- return 0;
-
- break;
- }
-
- return 1;
-}
-
//#define BEAMSTEER_VISUAL
float beamsweep(entity this, vector from, vector dir,float length, float step,float step_up, float step_down)
{
float i;
- vector a,b,u,d;
+ vector a, b, u, d;
u = '0 0 1' * step_up;
d = '0 0 1' * step_down;
if(trace_fraction == 1.0)
return 0;
- if(beamsweep_badpoint(trace_endpos,0))
+ if(!location_isok(trace_endpos, false, false))
return 0;
a = trace_endpos;
if(trace_fraction == 1.0)
return i / length;
- if(beamsweep_badpoint(trace_endpos,0))
+ if(!location_isok(trace_endpos, false, false))
return i / length;
#ifdef BEAMSTEER_VISUAL
te_lightning1(NULL,a+u,b+u);
if(bm_left + bm_right < 0.15)
{
- vr = normalize((v_forward*-1) + v_right * 0.75);
- vl = normalize((v_forward*-1) - v_right * 0.75);
+ vr = normalize((v_forward*-1) + v_right * 0.90);
+ vl = normalize((v_forward*-1) - v_right * 0.90);
bm_right = beamsweep(this, this.origin, vr, length, step, step_up, step_down);
bm_left = beamsweep(this, this.origin, vl, length, step, step_up, step_down);
flocker.health = 10;
flocker.pos1 = normalize(flocker.velocity + randomvec() * 0.1);
+ IL_PUSH(g_flockers, flocker);
+
this.cnt = this.cnt -1;
}
if(!this.enemy)
{
- FOREACH_ENTITY_FLOAT(flock_id, this.flock_id,
+ IL_EACH(g_flockers, it.flock_id == this.flock_id,
{
if(it == this.owner || it == ee)
continue;
- if(!this.enemy || vlen2(this.origin - it.origin) < vlen2(this.origin - this.enemy.origin))
+ if(!this.enemy || vlen2(this.origin - it.origin) > vlen2(this.origin - this.enemy.origin))
this.enemy = it;
});
}
this.enemy.nextthink = time + 10;
this.enemy.flock_id = this.flock_id;
this.enemy.owner = this;
+
+ IL_PUSH(g_flockers, this);
+ IL_PUSH(g_flockers, this.enemy);
}
#endif