X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fjumppads.qc;h=9e16c4ef06e128312859f57a16a3076cd10a9158;hb=a50c4f0676289e8ceb3a3df8bc84ad8f93085e61;hp=758ab9e801424ed717e34ab87777743a4abea66a;hpb=b9a47647fa6944318cf72c4ada681cefd3acaedb;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc index 758ab9e80..9e16c4ef0 100644 --- a/qcsrc/common/triggers/trigger/jumppads.qc +++ b/qcsrc/common/triggers/trigger/jumppads.qc @@ -1,14 +1,14 @@ // TODO: split target_push and put it in the target folder #ifdef SVQC #include "jumppads.qh" -#include "../../movetypes/movetypes.qh" +#include -void trigger_push_use() -{SELFPARAM(); +void trigger_push_use(entity this, entity actor, entity trigger) +{ if(teamplay) { - self.team = activator.team; - self.SendFlags |= 2; + this.team = actor.team; + this.SendFlags |= 2; } } #endif @@ -37,11 +37,7 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht) torg = tgt.origin + (tgt.mins + tgt.maxs) * 0.5; -#ifdef SVQC - grav = autocvar_sv_gravity; -#elif defined(CSQC) grav = PHYS_GRAVITY(other); -#endif if(PHYS_ENTGRAVITY(other)) grav *= PHYS_ENTGRAVITY(other); @@ -133,15 +129,13 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht) return sdir * vs + '0 0 1' * vz; } -void trigger_push_touch() -{SELFPARAM(); +void trigger_push_touch(entity this) +{ 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))) @@ -178,6 +172,22 @@ void trigger_push_touch() 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 @@ -213,7 +223,7 @@ void trigger_push_touch() else other.lastteleporttime = time; - if (other.deadflag == DEAD_NO) + if (!IS_DEAD(other)) animdecide_setaction(other, ANIMACTION_JUMP, true); } else @@ -225,10 +235,7 @@ void trigger_push_touch() } if(this.enemy.target) - { - activator = other; - WITH(entity, self, this.enemy, SUB_UseTargets()); - } + SUB_UseTargets(this.enemy, other, other); // TODO: do we need other as trigger too? if (other.flags & FL_PROJECTILE) { @@ -247,42 +254,48 @@ void trigger_push_touch() UpdateCSQCProjectile(other); } + /*if (other.flags & FL_ITEM) + { + ItemUpdate(other); + other.SendFlags |= ISF_DROP; + }*/ + if (this.spawnflags & PUSH_ONCE) { - this.touch = func_null; - this.think = SUB_Remove_self; + settouch(this, func_null); + setthink(this, SUB_Remove); this.nextthink = time; } #endif } #ifdef SVQC -void trigger_push_link(); -void trigger_push_updatelink(); +void trigger_push_link(entity this); +void trigger_push_updatelink(entity this); #endif -void trigger_push_findtarget() -{SELFPARAM(); +void trigger_push_findtarget(entity this) +{ entity t; vector org; // 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 = (this.absmin + this.absmax) * 0.5; + org_z = this.absmax.z - STAT(PL_MIN, NULL).z; - if (self.target) + if (this.target) { float n = 0; - for(t = world; (t = find(t, targetname, self.target)); ) + for(t = world; (t = find(t, targetname, this.target)); ) { ++n; #ifdef SVQC entity e = spawn(); setorigin(e, org); - setsize(e, PL_MIN, PL_MAX); - e.velocity = trigger_push_calculatevelocity(org, t, self.height); + setsize(e, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL)); + e.velocity = trigger_push_calculatevelocity(org, t, this.height); tracetoss(e, e); if(e.movetype == MOVETYPE_NONE) - waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); + waypoint_spawnforteleporter(this, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); remove(e); #endif } @@ -298,12 +311,12 @@ void trigger_push_findtarget() else if(n == 1) { // exactly one dest - bots love that - self.enemy = find(world, targetname, self.target); + this.enemy = find(world, targetname, this.target); } else { // have to use random selection every single time - self.enemy = world; + this.enemy = world; } } #ifdef SVQC @@ -311,15 +324,15 @@ void trigger_push_findtarget() { entity e = spawn(); setorigin(e, org); - setsize(e, PL_MIN, PL_MAX); - e.velocity = self.movedir; + setsize(e, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL)); + e.velocity = this.movedir; tracetoss(e, e); - waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); + waypoint_spawnforteleporter(this, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); remove(e); } - trigger_push_link(); - defer(self, 0.1, trigger_push_updatelink); + trigger_push_link(this); + defer(this, 0.1, trigger_push_updatelink); #endif } @@ -327,36 +340,25 @@ void trigger_push_findtarget() float trigger_push_send(entity this, entity to, float sf) { WriteHeader(MSG_ENTITY, ENT_CLIENT_TRIGGER_PUSH); - WriteByte(MSG_ENTITY, sf); - - if(sf & 1) - { - WriteByte(MSG_ENTITY, self.team); - WriteInt24_t(MSG_ENTITY, self.spawnflags); - WriteByte(MSG_ENTITY, self.active); - WriteCoord(MSG_ENTITY, self.height); - trigger_common_write(true); - } + WriteByte(MSG_ENTITY, this.team); + WriteInt24_t(MSG_ENTITY, this.spawnflags); + WriteByte(MSG_ENTITY, this.active); + WriteCoord(MSG_ENTITY, this.height); - if(sf & 2) - { - WriteByte(MSG_ENTITY, self.team); - WriteByte(MSG_ENTITY, self.active); - } + trigger_common_write(this, true); return true; } -void trigger_push_updatelink() -{SELFPARAM(); - self.SendFlags |= 1; +void trigger_push_updatelink(entity this) +{ + this.SendFlags |= 1; } -void trigger_push_link() +void trigger_push_link(entity this) { - BITSET_ASSIGN(self.effects, EF_NODEPTHTEST); - Net_LinkEntity(self, false, 0, trigger_push_send); + trigger_link(this, trigger_push_send); } /* @@ -373,25 +375,25 @@ void trigger_push_link() */ spawnfunc(trigger_push) { - SetMovedir(self); + SetMovedir(this); - EXACTTRIGGER_INIT; + trigger_init(this); - self.active = ACTIVE_ACTIVE; - self.use = trigger_push_use; - self.touch = trigger_push_touch; + this.active = ACTIVE_ACTIVE; + this.use = trigger_push_use; + settouch(this, trigger_push_touch); // normal push setup - if (!self.speed) - self.speed = 1000; - self.movedir = self.movedir * self.speed * 10; + if (!this.speed) + this.speed = 1000; + this.movedir = this.movedir * this.speed * 10; - if (!self.noise) - self.noise = "misc/jumppad.wav"; - precache_sound (self.noise); + if (!this.noise) + this.noise = "misc/jumppad.wav"; + precache_sound (this.noise); // this must be called to spawn the teleport waypoints for bots - InitializeEntity(self, trigger_push_findtarget, INITPRIO_FINDTARGET); + InitializeEntity(this, trigger_push_findtarget, INITPRIO_FINDTARGET); } @@ -399,94 +401,87 @@ bool target_push_send(entity this, entity to, float sf) { WriteHeader(MSG_ENTITY, ENT_CLIENT_TARGET_PUSH); - WriteByte(MSG_ENTITY, self.cnt); - WriteString(MSG_ENTITY, self.targetname); - WriteCoord(MSG_ENTITY, self.origin_x); - WriteCoord(MSG_ENTITY, self.origin_y); - WriteCoord(MSG_ENTITY, self.origin_z); + WriteByte(MSG_ENTITY, this.cnt); + WriteString(MSG_ENTITY, this.targetname); + WriteCoord(MSG_ENTITY, this.origin_x); + WriteCoord(MSG_ENTITY, this.origin_y); + WriteCoord(MSG_ENTITY, this.origin_z); - WriteAngle(MSG_ENTITY, self.angles_x); - WriteAngle(MSG_ENTITY, self.angles_y); - WriteAngle(MSG_ENTITY, self.angles_z); + WriteAngle(MSG_ENTITY, this.angles_x); + WriteAngle(MSG_ENTITY, this.angles_y); + WriteAngle(MSG_ENTITY, this.angles_z); 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 +} + +void target_push_init(entity this) +{ + this.mangle = this.angles; + setorigin(this, this.origin); + target_push_link(this); } -spawnfunc(target_push) { target_push_link(); } -spawnfunc(info_notnull) { target_push_link(); } -spawnfunc(target_position) { make_pure(this); target_push_link(); } +spawnfunc(target_push) { target_push_init(this); } +spawnfunc(info_notnull) { target_push_init(this); } +spawnfunc(target_position) { target_push_init(this); } #elif defined(CSQC) NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, bool isnew) { - make_pure(this); - float sf = ReadByte(); + this.classname = "jumppad"; + int mytm = ReadByte(); if(mytm) { this.team = mytm - 1; } + this.spawnflags = ReadInt24_t(); + this.active = ReadByte(); + this.height = ReadCoord(); - if(sf & 1) - { - self.classname = "jumppad"; - int mytm = ReadByte(); if(mytm) { self.team = mytm - 1; } - self.spawnflags = ReadInt24_t(); - self.active = ReadByte(); - self.height = ReadCoord(); - - trigger_common_read(true); - - self.entremove = trigger_remove_generic; - self.solid = SOLID_TRIGGER; - //self.draw = trigger_draw_generic; - self.move_touch = trigger_push_touch; - self.drawmask = MASK_NORMAL; - self.move_time = time; - defer(self, 0.25, trigger_push_findtarget); - } + trigger_common_read(this, true); + + this.entremove = trigger_remove_generic; + this.solid = SOLID_TRIGGER; + settouch(this, trigger_push_touch); + this.move_time = time; + defer(this, 0.25, trigger_push_findtarget); - if(sf & 2) - { - self.team = ReadByte(); - self.active = ReadByte(); - } 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()); - self.origin_x = ReadCoord(); - self.origin_y = ReadCoord(); - self.origin_z = ReadCoord(); - - self.angles_x = ReadAngle(); - self.angles_y = ReadAngle(); - self.angles_z = ReadAngle(); + this.classname = "push_target"; + this.cnt = ReadByte(); + this.targetname = strzone(ReadString()); + this.origin_x = ReadCoord(); + this.origin_y = ReadCoord(); + this.origin_z = ReadCoord(); + + this.angles_x = ReadAngle(); + this.angles_y = ReadAngle(); + this.angles_z = ReadAngle(); return = true; - setorigin(self, self.origin); + setorigin(this, this.origin); - self.drawmask = MASK_NORMAL; - self.entremove = target_push_remove; + this.drawmask = MASK_NORMAL; + this.entremove = target_push_remove; } #endif