From efe77d9fc618bb8f89b28bb062ebf523a3bcd670 Mon Sep 17 00:00:00 2001 From: Nick S Date: Fri, 30 Jun 2023 00:52:07 +0300 Subject: [PATCH] Unbreak the merge --- qcsrc/common/mapobjects/trigger/jumppads.qc | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc index 4dc6850574..f7281e5e4a 100644 --- a/qcsrc/common/mapobjects/trigger/jumppads.qc +++ b/qcsrc/common/mapobjects/trigger/jumppads.qc @@ -249,23 +249,8 @@ bool jumppad_push(entity this, entity targ, bool is_velocity_pad) vector org = targ.origin; - if(STAT(Q3COMPAT, targ) || this.spawnflags & PUSH_STATIC) - { + if(Q3COMPAT_COMMON || this.spawnflags & PUSH_STATIC) org = (this.absmin + this.absmax) * 0.5; - } - - bool already_pushed = false; - if(is_velocity_pad) // remember velocity jump pads - { - if(this == targ.last_pushed || (targ.last_pushed && !STAT(Q3COMPAT, targ))) // if q3compat is active overwrite last stored jump pad, otherwise ignore - { - already_pushed = true; - } - else - { - targ.last_pushed = this; // may be briefly out of sync between client and server if client prediction is toggled - } - } bool already_pushed = false; if(is_velocity_pad) // remember velocity jump pads -- 2.39.2