fix Hook_OnPhysicsSimulate crash and other crashes

CS2Surf-CN · Jan 31, 2025 · f1d1df2 · f1d1df2
1 parent 551f06d
commit f1d1df2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/core/interfaces.cpp b/src/core/interfaces.cpp
@@ -18,6 +18,10 @@ bool IFACE::Setup(ISmmAPI* ismm, char* error, size_t maxlen) {
 	GET_V_IFACE_CURRENT(GetEngineFactory, IFACE::pGameEventSystem, IGameEventSystem, GAMEEVENTSYSTEM_INTERFACE_VERSION);
 	GET_V_IFACE_CURRENT(GetFileSystemFactory, g_pFullFileSystem, IFileSystem, FILESYSTEM_INTERFACE_VERSION);
 
+	return true;
+}
+
+bool IFACE::PostSetup() {
 	IFACE::pGameEventManager = (IGameEventManager2*)GAMEDATA::GetAddress("GetGameEventManager");
 	IFACE::pGameTraceService = (CGameTraceService*)GAMEDATA::GetAddress("GetGameTraceService");
 

diff --git a/src/core/interfaces.h b/src/core/interfaces.h
@@ -19,4 +19,5 @@ namespace IFACE {
 	inline CGameTraceService* pGameTraceService = nullptr;
 
 	bool Setup(ISmmAPI* ismm, char* error, size_t maxlen);
+	bool PostSetup();
 } // namespace IFACE
diff --git a/src/cs2surf.cpp b/src/cs2surf.cpp
@@ -44,16 +44,17 @@ bool CSurfPlugin::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, b
 
 	g_SMAPI->AddListener(this, this);
 
-	FORWARD_POST(CCoreForward, OnPluginStart);
-
 	return true;
 }
 
 void CSurfPlugin::AllPluginsLoaded() {
+	IFACE::PostSetup();
 	MEM::SetupHooks();
 	MOVEMENT::SetupHooks();
 
 	g_pMultiAddonManager = (IMultiAddonManager*)g_SMAPI->MetaFactory(MULTIADDONMANAGER_INTERFACE, nullptr, nullptr);
+
+	FORWARD_POST(CCoreForward, OnPluginStart);
 }
 
 void CSurfPlugin::OnLevelInit(char const* pMapName, char const* pMapEntities, char const* pOldLevel, char const* pLandmarkName, bool loadGame, bool background) {

diff --git a/src/movement/mv_hooks.cpp b/src/movement/mv_hooks.cpp
@@ -206,13 +206,13 @@ static void Hook_OnProcessMovement(CCSPlayer_MovementServices* ms, CMoveData* mv
 	FORWARD_POST(CMovementForward, OnProcessMovementPost, ms, mv);
 }
 
-static void Hook_OnPhysicsSimulate(CCSPlayerController* pController) {
+static float Hook_OnPhysicsSimulate(CCSPlayerController* pController) {
 	if (pController->m_bIsHLTV()) {
-		return;
+		return 0.0f;
 	}
 
 	if (!pController) {
-		return MEM::SDKCall<void>(MOVEMENT::TRAMPOLINE::g_fnPhysicsSimulate, pController);
+		return MEM::SDKCall<float>(MOVEMENT::TRAMPOLINE::g_fnPhysicsSimulate, pController);
 	}
 
 	SurfPlugin()->simulatingPhysics = true;
@@ -224,14 +224,16 @@ static void Hook_OnPhysicsSimulate(CCSPlayerController* pController) {
 		}
 	}
 	if (block) {
-		return;
+		return 0.0f;
 	}
 
-	MEM::SDKCall<void>(MOVEMENT::TRAMPOLINE::g_fnPhysicsSimulate, pController);
+	float flSimulationTime = MEM::SDKCall<float>(MOVEMENT::TRAMPOLINE::g_fnPhysicsSimulate, pController);
 
 	SurfPlugin()->simulatingPhysics = false;
 
 	FORWARD_POST(CMovementForward, OnPhysicsSimulatePost, pController);
+
+	return flSimulationTime;
 }
 
 static float Hook_OnGetMaxSpeed(CCSPlayerPawn* pawn) {