From 5b056d34de1dc5c132f056e012afef2190910c6d Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 18 Aug 2019 13:16:45 +1000 Subject: [PATCH] Only cancel out the secondary flags when launcher is set on target_speed --- qcsrc/server/compat/quake3.qc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- 2.39.2