X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fimpulse.qc;h=cb9c2d293558fad6829c7e888a08c9cfc63c0f40;hb=65e9ceb03c81bc515d090a54f65dd620c8c6dc43;hp=977821d44d7689b37b8cc3f3d9788ee104a7d90c;hpb=1d70346809dd33b32864b3832662878077588e4b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/triggers/trigger/impulse.qc b/qcsrc/common/triggers/trigger/impulse.qc index 977821d44..cb9c2d293 100644 --- a/qcsrc/common/triggers/trigger/impulse.qc +++ b/qcsrc/common/triggers/trigger/impulse.qc @@ -1,118 +1,125 @@ +#include "impulse.qh" // targeted (directional) mode -void trigger_impulse_touch1() -{SELFPARAM(); +void trigger_impulse_touch1(entity this, entity toucher) +{ entity targ; float pushdeltatime; float str; - if (self.active != ACTIVE_ACTIVE) + if (this.active != ACTIVE_ACTIVE) return; - if (!isPushable(other)) + if (!isPushable(toucher)) return; - EXACTTRIGGER_TOUCH; + EXACTTRIGGER_TOUCH(this, toucher); - targ = find(world, targetname, self.target); + targ = find(NULL, targetname, this.target); if(!targ) { - objerror("trigger_force without a (valid) .target!\n"); - remove(self); + objerror(this, "trigger_force without a (valid) .target!\n"); + delete(this); return; } - str = min(self.radius, vlen(self.origin - other.origin)); + str = min(this.radius, vlen(this.origin - toucher.origin)); - if(self.falloff == 1) - str = (str / self.radius) * self.strength; - else if(self.falloff == 2) - str = (1 - (str / self.radius)) * self.strength; + if(this.falloff == 1) + str = (str / this.radius) * this.strength; + else if(this.falloff == 2) + str = (1 - (str / this.radius)) * this.strength; else - str = self.strength; + str = this.strength; - pushdeltatime = time - other.lastpushtime; + pushdeltatime = time - toucher.lastpushtime; if (pushdeltatime > 0.15) pushdeltatime = 0; - other.lastpushtime = time; + toucher.lastpushtime = time; if(!pushdeltatime) return; - if(self.spawnflags & 64) + if(this.spawnflags & 64) { - float addspeed = str - other.velocity * normalize(targ.origin - self.origin); + float addspeed = str - toucher.velocity * normalize(targ.origin - this.origin); if (addspeed > 0) { float accelspeed = min(8 * pushdeltatime * str, addspeed); - other.velocity += accelspeed * normalize(targ.origin - self.origin); + toucher.velocity += accelspeed * normalize(targ.origin - this.origin); } } else - other.velocity = other.velocity + normalize(targ.origin - self.origin) * str * pushdeltatime; - other.flags &= ~FL_ONGROUND; + toucher.velocity = toucher.velocity + normalize(targ.origin - this.origin) * str * pushdeltatime; + + UNSET_ONGROUND(toucher); + #ifdef SVQC - UpdateCSQCProjectile(other); + UpdateCSQCProjectile(toucher); #endif } // Directionless (accelerator/decelerator) mode -void trigger_impulse_touch2() -{SELFPARAM(); +void trigger_impulse_touch2(entity this, entity toucher) +{ float pushdeltatime; - if (self.active != ACTIVE_ACTIVE) + if (this.active != ACTIVE_ACTIVE) return; - if (!isPushable(other)) + if (!isPushable(toucher)) return; - EXACTTRIGGER_TOUCH; + EXACTTRIGGER_TOUCH(this, toucher); - pushdeltatime = time - other.lastpushtime; + pushdeltatime = time - toucher.lastpushtime; if (pushdeltatime > 0.15) pushdeltatime = 0; - other.lastpushtime = time; + toucher.lastpushtime = time; if(!pushdeltatime) return; // div0: ticrate independent, 1 = identity (not 20) - other.velocity = other.velocity * pow(self.strength, pushdeltatime); + toucher.velocity = toucher.velocity * pow(this.strength, pushdeltatime); + #ifdef SVQC - UpdateCSQCProjectile(other); + UpdateCSQCProjectile(toucher); #endif } // Spherical (gravity/repulsor) mode -void trigger_impulse_touch3() -{SELFPARAM(); +void trigger_impulse_touch3(entity this, entity toucher) +{ float pushdeltatime; float str; - if (self.active != ACTIVE_ACTIVE) + if (this.active != ACTIVE_ACTIVE) return; - if (!isPushable(other)) + if (!isPushable(toucher)) return; - EXACTTRIGGER_TOUCH; + EXACTTRIGGER_TOUCH(this, toucher); - pushdeltatime = time - other.lastpushtime; + pushdeltatime = time - toucher.lastpushtime; if (pushdeltatime > 0.15) pushdeltatime = 0; - other.lastpushtime = time; + toucher.lastpushtime = time; if(!pushdeltatime) return; - setsize(self, '-1 -1 -1' * self.radius,'1 1 1' * self.radius); + setsize(this, '-1 -1 -1' * this.radius,'1 1 1' * this.radius); - str = min(self.radius, vlen(self.origin - other.origin)); + str = min(this.radius, vlen(this.origin - toucher.origin)); - if(self.falloff == 1) - str = (1 - str / self.radius) * self.strength; // 1 in the inside - else if(self.falloff == 2) - str = (str / self.radius) * self.strength; // 0 in the inside + if(this.falloff == 1) + str = (1 - str / this.radius) * this.strength; // 1 in the inside + else if(this.falloff == 2) + str = (str / this.radius) * this.strength; // 0 in the inside else - str = self.strength; + str = this.strength; + + toucher.velocity = toucher.velocity + normalize(toucher.origin - this.origin) * str * pushdeltatime; - other.velocity = other.velocity + normalize(other.origin - self.origin) * str * pushdeltatime; #ifdef SVQC - UpdateCSQCProjectile(other); + UpdateCSQCProjectile(toucher); #endif } +REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_IMPULSE) + /*QUAKED spawnfunc_trigger_impulse (.5 .5 .5) ? -------- KEYS -------- target : If this is set, this points to the spawnfunc_target_position to which the player will get pushed. @@ -131,74 +138,75 @@ Use a brush textured with common/origin in the trigger entity to determine the o in directional and sperical mode. For damper/accelerator mode this is not nessesary (and has no effect). */ #ifdef SVQC -bool trigger_impulse_send(entity to, int sf) -{SELFPARAM(); +bool trigger_impulse_send(entity this, entity to, int sf) +{ WriteHeader(MSG_ENTITY, ENT_CLIENT_TRIGGER_IMPULSE); - WriteCoord(MSG_ENTITY, self.radius); - WriteCoord(MSG_ENTITY, self.strength); - WriteByte(MSG_ENTITY, self.falloff); - WriteByte(MSG_ENTITY, self.active); + WriteInt24_t(MSG_ENTITY, this.spawnflags); + WriteCoord(MSG_ENTITY, this.radius); + WriteCoord(MSG_ENTITY, this.strength); + WriteByte(MSG_ENTITY, this.falloff); + WriteByte(MSG_ENTITY, this.active); - trigger_common_write(true); + trigger_common_write(this, true); return true; } -void trigger_impulse_link() +void trigger_impulse_link(entity this) { - //Net_LinkEntity(self, 0, false, trigger_impulse_send); + trigger_link(this, trigger_impulse_send); } spawnfunc(trigger_impulse) { - self.active = ACTIVE_ACTIVE; + this.active = ACTIVE_ACTIVE; - EXACTTRIGGER_INIT; - if(self.radius) + trigger_init(this); + + if(this.radius) { - if(!self.strength) self.strength = 2000 * autocvar_g_triggerimpulse_radial_multiplier; - setorigin(self, self.origin); - setsize(self, '-1 -1 -1' * self.radius,'1 1 1' * self.radius); - self.touch = trigger_impulse_touch3; + if(!this.strength) this.strength = 2000 * autocvar_g_triggerimpulse_radial_multiplier; + setorigin(this, this.origin); + setsize(this, '-1 -1 -1' * this.radius,'1 1 1' * this.radius); + settouch(this, trigger_impulse_touch3); } else { - if(self.target) + if(this.target) { - if(!self.strength) self.strength = 950 * autocvar_g_triggerimpulse_directional_multiplier; - self.touch = trigger_impulse_touch1; + if(!this.strength) this.strength = 950 * autocvar_g_triggerimpulse_directional_multiplier; + settouch(this, trigger_impulse_touch1); } else { - if(!self.strength) self.strength = 0.9; - self.strength = pow(self.strength, autocvar_g_triggerimpulse_accel_power) * autocvar_g_triggerimpulse_accel_multiplier; - self.touch = trigger_impulse_touch2; + if(!this.strength) this.strength = 0.9; + this.strength = pow(this.strength, autocvar_g_triggerimpulse_accel_power) * autocvar_g_triggerimpulse_accel_multiplier; + settouch(this, trigger_impulse_touch2); } } - trigger_impulse_link(); + trigger_impulse_link(this); } #elif defined(CSQC) -void ent_trigger_impulse() -{SELFPARAM(); - self.radius = ReadCoord(); - self.strength = ReadCoord(); - self.falloff = ReadByte(); - self.active = ReadByte(); - - trigger_common_read(true); - - - self.classname = "trigger_impulse"; - self.solid = SOLID_TRIGGER; - self.entremove = trigger_remove_generic; - self.draw = trigger_draw_generic; - self.drawmask = MASK_NORMAL; - self.move_time = time; - - if(self.radius) { self.trigger_touch = trigger_impulse_touch3; } - else if(self.target) { self.trigger_touch = trigger_impulse_touch1; } - else { self.trigger_touch = trigger_impulse_touch2; } +NET_HANDLE(ENT_CLIENT_TRIGGER_IMPULSE, bool isnew) +{ + this.spawnflags = ReadInt24_t(); + this.radius = ReadCoord(); + this.strength = ReadCoord(); + this.falloff = ReadByte(); + this.active = ReadByte(); + + trigger_common_read(this, true); + return = true; + + this.classname = "trigger_impulse"; + this.solid = SOLID_TRIGGER; + this.entremove = trigger_remove_generic; + this.move_time = time; + + if (this.radius) { settouch(this, trigger_impulse_touch3); } + else if (this.target) { settouch(this, trigger_impulse_touch1); } + else { settouch(this, trigger_impulse_touch2); } } #endif