X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftrigger%2Fjumppads.qc;h=67bb65191cb2b8643189828433dc696f2ceec9d7;hb=bda29da7c83e61ef45bce71d9a0c53115cd56752;hp=5273179adfeb047faeea7f8d7c7ab518cebc9d60;hpb=6ae488fa94396ad9ffa0dc3dbfbedb54c8b7983a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc index 5273179ad..67bb65191 100644 --- a/qcsrc/common/mapobjects/trigger/jumppads.qc +++ b/qcsrc/common/mapobjects/trigger/jumppads.qc @@ -2,7 +2,6 @@ // TODO: split target_push and put it in the target folder #ifdef SVQC #include -#include void trigger_push_use(entity this, entity actor, entity trigger) { @@ -135,11 +134,8 @@ bool jumppad_push(entity this, entity targ) return false; vector org = targ.origin; -#ifdef SVQC - if(autocvar_sv_q3defragcompat) -#elif defined(CSQC) - if(STAT(Q3DEFRAGCOMPAT)) -#endif + + if(STAT(Q3COMPAT)) { org.z += targ.mins_z; org.z += 1; // off by 1! @@ -193,7 +189,9 @@ bool jumppad_push(entity this, entity targ) // reset tracking of oldvelocity for impact damage (sudden velocity changes) targ.oldvelocity = targ.velocity; - if(this.pushltime < time) // prevent "snorring" sound when a player hits the jumppad more than once + // prevent sound spam when a player hits the jumppad more than once + // or when a dead player gets stuck in the jumppad for some reason + if(this.pushltime < time && !(IS_DEAD(targ) && targ.velocity == '0 0 0')) { // flash when activated Send_Effect(EFFECT_JUMPPAD, targ.origin, targ.velocity, 1); @@ -691,12 +689,7 @@ spawnfunc(target_position) NET_HANDLE(ENT_CLIENT_TRIGGER_PUSH, bool isnew) { - this.classname = "jumppad"; - int mytm = ReadByte(); - if(mytm) - { - this.team = mytm - 1; - } + int mytm = ReadByte(); if(mytm) { this.team = mytm - 1; } this.spawnflags = ReadInt24_t(); this.active = ReadByte(); this.height = ReadCoord(); @@ -720,7 +713,6 @@ void target_push_remove(entity this) NET_HANDLE(ENT_CLIENT_TARGET_PUSH, bool isnew) { - this.classname = "push_target"; this.cnt = ReadByte(); this.targetname = strzone(ReadString()); this.origin = ReadVector();