From 6a8d4cb5c203d2b754808c26b8bd483e4bae4f7d Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 29 Nov 2015 20:42:38 +1000 Subject: [PATCH] Clean up hacks a bit --- qcsrc/common/movetypes/walk.qc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/movetypes/walk.qc b/qcsrc/common/movetypes/walk.qc index 23d6e01a8..7fab2787e 100644 --- a/qcsrc/common/movetypes/walk.qc +++ b/qcsrc/common/movetypes/walk.qc @@ -89,11 +89,10 @@ void _Movetype_Physics_Walk(entity this, float dt) // SV_WalkMove // move up vector upmove = '0 0 1' * PHYS_STEPHEIGHT; - vector prev_origin = this.move_origin; _Movetype_PushEntity(this, upmove, true); if(wasfreed(this)) return; - if(trace_startsolid && this.move_origin != prev_origin) + if(trace_startsolid) { // we got teleported when upstepping... must abort the move return; @@ -145,12 +144,11 @@ void _Movetype_Physics_Walk(entity this, float dt) // SV_WalkMove // move down vector downmove = '0 0 1' * (-PHYS_STEPHEIGHT + start_velocity.z * dt); - vector prev_origin = this.move_origin; _Movetype_PushEntity(this, downmove, true); if(wasfreed(this)) return; - if(trace_startsolid && this.move_origin != prev_origin) + if(trace_startsolid) { // we got teleported when downstepping... must abort the move return; -- 2.39.2