From 59512cd94fe540bbfe0581094d070627bfc4de36 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 9 Jul 2015 12:13:42 +1000 Subject: [PATCH] Add a hack to fix jumping prediction with the engine's version of physics, also default to QC physics --- qcsrc/csqcmodellib/cl_player.qc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/csqcmodellib/cl_player.qc index 12ffe5b2f..436052767 100644 --- a/qcsrc/csqcmodellib/cl_player.qc +++ b/qcsrc/csqcmodellib/cl_player.qc @@ -135,12 +135,23 @@ void CSQCPlayer_SavePrediction() void CSQC_ClientMovement_PlayerMove_Frame(); +void PM_Movement_Move() +{ + runstandardplayerphysics(self); +#ifdef CSQC + self.flags = + ((self.pmove_flags & PMF_DUCKED) ? FL_DUCKED : 0) | + (!(self.pmove_flags & PMF_JUMP_HELD) ? FL_JUMPRELEASED : 0) | + ((self.pmove_flags & PMF_ONGROUND) ? FL_ONGROUND : 0); +#endif +} + void CSQCPlayer_Physics(void) { switch(autocvar_cl_movement) { - case 1: runstandardplayerphysics(self); break; - case 2: CSQC_ClientMovement_PlayerMove_Frame(); break; + case 1: CSQC_ClientMovement_PlayerMove_Frame(); break; + case 2: PM_Movement_Move(); break; } } -- 2.39.2