X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fimpulse.qc;h=1125169011ee6f5c25596ca7df17958f9d842b84;hb=afb64a6464e74357bc69ac3386818917601a2ef4;hp=7b8ebcfde91e67627c4ca76b6494441d87fc59a5;hpb=6d2e1250338afadbd5587020302265f42bd0e889;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/triggers/trigger/impulse.qc b/qcsrc/common/triggers/trigger/impulse.qc index 7b8ebcfde..112516901 100644 --- a/qcsrc/common/triggers/trigger/impulse.qc +++ b/qcsrc/common/triggers/trigger/impulse.qc @@ -1,6 +1,6 @@ // targeted (directional) mode void trigger_impulse_touch1() -{ +{SELFPARAM(); entity targ; float pushdeltatime; float str; @@ -21,7 +21,11 @@ void trigger_impulse_touch1() return; } +#ifdef SVQC str = min(self.radius, vlen(self.origin - other.origin)); +#elif defined(CSQC) + str = min(self.radius, vlen(self.origin - other.move_origin)); +#endif if(self.falloff == 1) str = (str / self.radius) * self.strength; @@ -37,24 +41,41 @@ void trigger_impulse_touch1() if(self.spawnflags & 64) { +#ifdef SVQC float addspeed = str - other.velocity * normalize(targ.origin - self.origin); if (addspeed > 0) { float accelspeed = min(8 * pushdeltatime * str, addspeed); other.velocity += accelspeed * normalize(targ.origin - self.origin); } +#elif defined(CSQC) + float addspeed = str - other.move_velocity * normalize(targ.origin - self.origin); + if (addspeed > 0) + { + float accelspeed = min(8 * pushdeltatime * str, addspeed); + other.move_velocity += accelspeed * normalize(targ.origin - self.origin); + } +#endif } else +#ifdef SVQC other.velocity = other.velocity + normalize(targ.origin - self.origin) * str * pushdeltatime; - other.flags &= ~FL_ONGROUND; +#elif defined(CSQC) + other.move_velocity = other.move_velocity + normalize(targ.origin - self.origin) * str * pushdeltatime; +#endif + #ifdef SVQC + UNSET_ONGROUND(other); + UpdateCSQCProjectile(other); +#elif defined(CSQC) + other.move_flags &= ~FL_ONGROUND; #endif } // Directionless (accelerator/decelerator) mode void trigger_impulse_touch2() -{ +{SELFPARAM(); float pushdeltatime; if (self.active != ACTIVE_ACTIVE) @@ -71,15 +92,18 @@ void trigger_impulse_touch2() if(!pushdeltatime) return; // div0: ticrate independent, 1 = identity (not 20) - other.velocity = other.velocity * pow(self.strength, pushdeltatime); #ifdef SVQC + other.velocity = other.velocity * pow(self.strength, pushdeltatime); + UpdateCSQCProjectile(other); +#elif defined(CSQC) + other.move_velocity = other.move_velocity * pow(self.strength, pushdeltatime); #endif } // Spherical (gravity/repulsor) mode void trigger_impulse_touch3() -{ +{SELFPARAM(); float pushdeltatime; float str; @@ -98,7 +122,11 @@ void trigger_impulse_touch3() setsize(self, '-1 -1 -1' * self.radius,'1 1 1' * self.radius); +#ifdef SVQC str = min(self.radius, vlen(self.origin - other.origin)); +#elif defined(CSQC) + str = min(self.radius, vlen(self.origin - other.move_origin)); +#endif if(self.falloff == 1) str = (1 - str / self.radius) * self.strength; // 1 in the inside @@ -107,12 +135,17 @@ void trigger_impulse_touch3() else str = self.strength; - other.velocity = other.velocity + normalize(other.origin - self.origin) * str * pushdeltatime; #ifdef SVQC + other.velocity = other.velocity + normalize(other.origin - self.origin) * str * pushdeltatime; + UpdateCSQCProjectile(other); +#elif defined(CSQC) + other.move_velocity = other.move_velocity + normalize(other.move_origin - self.origin) * str * pushdeltatime; #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 +164,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) +bool trigger_impulse_send(entity this, entity to, int sf) { - WriteByte(MSG_ENTITY, ENT_CLIENT_TRIGGER_IMPULSE); + 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); } -void spawnfunc_trigger_impulse() +spawnfunc(trigger_impulse) { - self.active = ACTIVE_ACTIVE; + this.active = ACTIVE_ACTIVE; + + trigger_init(this); - EXACTTRIGGER_INIT; - if(self.radius) + 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() +NET_HANDLE(ENT_CLIENT_TRIGGER_IMPULSE, bool isnew) { - 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; } + 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) { this.move_touch = trigger_impulse_touch3; } + else if(this.target) { this.move_touch = trigger_impulse_touch1; } + else { this.move_touch = trigger_impulse_touch2; } } #endif