remove ValveSoftware/source-sdk-2013#442 due to grappling beam bugs

FIREFIGHT-RELOADED · Mar 31, 2022 · 527fd01 · 527fd01
1 parent 3b26616
commit 527fd01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/sp/src/game/client/prediction.cpp b/sp/src/game/client/prediction.cpp
@@ -903,9 +903,9 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		pVehicle->ProcessMovement( player, g_pMoveData );
 	}
 
-	RunPostThink( player );
+	FinishMove( player, ucmd, g_pMoveData );
 
-	FinishMove(player, ucmd, g_pMoveData);
+	RunPostThink( player );
 
 	g_pGameMovement->FinishTrackPredictionErrors( player );
 

diff --git a/sp/src/game/server/player_command.cpp b/sp/src/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 );
 
@@ -443,12 +438,17 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		VPROF( "pVehicle->ProcessMovement()" );
 		pVehicle->ProcessMovement( player, g_pMoveData );
 	}
-
-	RunPostThink(player);
-
+
 	// 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 );
 
 	FinishCommand( player );