From: Mario Date: Sun, 18 Aug 2019 03:16:45 +0000 (+1000) Subject: Only cancel out the secondary flags when launcher is set on target_speed X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMario%2Ftarget_speed;p=xonotic%2Fxonotic-data.pk3dir.git Only cancel out the secondary flags when launcher is set on target_speed --- diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc index f9d474088..fdf2e457c 100644 --- a/qcsrc/server/compat/quake3.qc +++ b/qcsrc/server/compat/quake3.qc @@ -246,7 +246,7 @@ void target_speed_use(entity this, entity actor, entity trigger) bool launcher = (this.spawnflags & TSPEED_LAUNCHER); -#define HAVE_ONE(flg, plusflg, minusflg) (((flg & plusflg) && !(flg & minusflg)) || ((flg & minusflg) && !(flg & plusflg))) +#define HAVE_ONE(flg, plusflg, minusflg) (((flg & plusflg) && (!(flg & minusflg) || !launcher)) || ((flg & minusflg) && (!(flg & plusflg) || !launcher))) if(HAVE_ONE(this.spawnflags, TSPEED_PLUSX, TSPEED_MINUSX) && (actor.velocity_x || launcher)) actor.velocity_x = target_speed_getspeed((this.spawnflags & TSPEED_PLUSX), this.spawnflags, actor.velocity_x, this.speed); if(HAVE_ONE(this.spawnflags, TSPEED_PLUSY, TSPEED_MINUSY) && (actor.velocity_y || launcher))