From: Mario Date: Sun, 29 Nov 2015 10:42:38 +0000 (+1000) Subject: Clean up hacks a bit X-Git-Tag: xonotic-v0.8.2~1606 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6a8d4cb5c203d2b754808c26b8bd483e4bae4f7d;p=xonotic%2Fxonotic-data.pk3dir.git Clean up hacks a bit --- 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;