// TODO: split target_push and put it in the target folder
#ifdef SVQC
#include "jumppads.qh"
-#include "../../movetypes/movetypes.qh"
+#include <common/physics/movetypes/movetypes.qh>
void trigger_push_use()
{SELFPARAM();
if (this.active == ACTIVE_NOT)
return;
-#ifdef SVQC
if (!isPushable(other))
return;
-#endif
if(this.team)
if(((this.spawnflags & 4) == 0) == (DIFF_TEAM(this, other)))
UNSET_ONGROUND(other);
#elif defined(CSQC)
other.move_flags &= ~FL_ONGROUND;
+
+ if (other.flags & FL_PROJECTILE)
+ {
+ other.move_angles = vectoangles (other.move_velocity);
+ switch(other.move_movetype)
+ {
+ case MOVETYPE_FLY:
+ other.move_movetype = MOVETYPE_TOSS;
+ other.gravity = 1;
+ break;
+ case MOVETYPE_BOUNCEMISSILE:
+ other.move_movetype = MOVETYPE_BOUNCE;
+ other.gravity = 1;
+ break;
+ }
+ }
#endif
#ifdef SVQC
else
other.lastteleporttime = time;
- if (other.deadflag == DEAD_NO)
+ if (!IS_DEAD(other))
animdecide_setaction(other, ANIMACTION_JUMP, true);
}
else
UpdateCSQCProjectile(other);
}
- if (other.flags & FL_ITEM)
+ /*if (other.flags & FL_ITEM)
{
ItemUpdate(other);
other.SendFlags |= ISF_DROP;
- }
+ }*/
if (this.spawnflags & PUSH_ONCE)
{
// first calculate a typical start point for the jump
org = (self.absmin + self.absmax) * 0.5;
- org_z = self.absmax.z - PL_MIN.z;
+ org_z = self.absmax.z - STAT(PL_MIN, NULL).z;
if (self.target)
{
#ifdef SVQC
entity e = spawn();
setorigin(e, org);
- setsize(e, PL_MIN, PL_MAX);
+ setsize(e, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL));
e.velocity = trigger_push_calculatevelocity(org, t, self.height);
tracetoss(e, e);
if(e.movetype == MOVETYPE_NONE)
{
entity e = spawn();
setorigin(e, org);
- setsize(e, PL_MIN, PL_MAX);
+ setsize(e, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL));
e.velocity = self.movedir;
tracetoss(e, e);
waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity));
void trigger_push_link()
{
+ SELFPARAM();
trigger_link(self, trigger_push_send);
}
return true;
}
-void target_push_link()
-{SELFPARAM();
- BITSET_ASSIGN(self.effects, EF_NODEPTHTEST);
- Net_LinkEntity(self, false, 0, target_push_send);
- //self.SendFlags |= 1; // update
+void target_push_link(entity this)
+{
+ BITSET_ASSIGN(this.effects, EF_NODEPTHTEST);
+ Net_LinkEntity(this, false, 0, target_push_send);
+ //this.SendFlags |= 1; // update
}
-spawnfunc(target_push) { target_push_link(); }
-spawnfunc(info_notnull) { target_push_link(); }
-spawnfunc(target_position) { make_pure(this); target_push_link(); }
+void target_push_init(entity this)
+{
+ this.mangle = this.angles;
+ setorigin(this, this.origin);
+ target_push_link(this);
+}
+
+spawnfunc(target_push) { target_push_init(this); }
+spawnfunc(info_notnull) { target_push_init(this); }
+spawnfunc(target_position) { target_push_init(this); }
#elif defined(CSQC)
return true;
}
-void target_push_remove()
-{SELFPARAM();
- if(self.classname)
- strunzone(self.classname);
- self.classname = string_null;
+void target_push_remove(entity this)
+{
+ if(this.classname)
+ strunzone(this.classname);
+ this.classname = string_null;
- if(self.targetname)
- strunzone(self.targetname);
- self.targetname = string_null;
+ if(this.targetname)
+ strunzone(this.targetname);
+ this.targetname = string_null;
}
NET_HANDLE(ENT_CLIENT_TARGET_PUSH, bool isnew)
{
- make_pure(this);
self.classname = "push_target";
self.cnt = ReadByte();
self.targetname = strzone(ReadString());