From 60632d72868ecac6d11f7c7e281a2afe9c261c81 Mon Sep 17 00:00:00 2001 From: SanyaSho Date: Fri, 19 Aug 2022 23:00:06 +0300 Subject: [PATCH] Revert "game: fixes some player's origin displacements for fire events, impulses commands etc... (ValveSoftware/source-sdk-2013#442)" This reverts commit 2e969d389042ef1b2f66259860aa7a74bbffae44. --- game/client/prediction.cpp | 4 ++-- game/server/player_command.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/game/client/prediction.cpp b/game/client/prediction.cpp index 508fc5de84..6646f8f9e0 100644 --- a/game/client/prediction.cpp +++ b/game/client/prediction.cpp @@ -903,10 +903,10 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper pVehicle->ProcessMovement( player, g_pMoveData ); } - RunPostThink( player ); - FinishMove( player, ucmd, g_pMoveData ); + RunPostThink( player ); + g_pGameMovement->FinishTrackPredictionErrors( player ); FinishCommand( player ); diff --git a/game/server/player_command.cpp b/game/server/player_command.cpp index 0b82f71940..b607bbab8a 100644 --- a/game/server/player_command.cpp +++ b/game/server/player_command.cpp @@ -417,11 +417,6 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper player->pl.v_angle = ucmd->viewangles + player->pl.anglechange; } - // Let server invoke any needed impact functions - VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" ); - moveHelper->ProcessImpacts(); - VPROF_SCOPE_END(); - // Call standard client pre-think RunPreThink( player ); @@ -447,6 +442,11 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper // Copy output FinishMove( player, ucmd, g_pMoveData ); + // Let server invoke any needed impact functions + VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" ); + moveHelper->ProcessImpacts(); + VPROF_SCOPE_END(); + RunPostThink( player ); g_pGameMovement->FinishTrackPredictionErrors( player );