physenv: testing a fix for another crash

RaphaelIT7 · Nov 19, 2024 · 14e9ee0 · 14e9ee0
1 parent 5a9cd8e
commit 14e9ee0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 16 deletions.
diff --git a/source/modules/physenv.cpp b/source/modules/physenv.cpp
@@ -299,13 +299,15 @@ Get_LuaClass(ICollisionQuery, ICollisionQuery_TypeID, "ICollisionQuery")
 
 static Push_LuaClass(Vector, GarrysMod::Lua::Type::Vector)
 
-inline IPhysicsEnvironment* GetPhysicsEnvironment(int iStackPos, bool bError)
+static IPhysicsEnvironment* GetPhysicsEnvironment(int iStackPos, bool bError)
 {
-	ILuaPhysicsEnvironment* pEnvironment = Get_ILuaPhysicsEnvironment(iStackPos, bError);
-	if (!pEnvironment->pEnvironment && bError)
+	ILuaPhysicsEnvironment* pLuaEnv = Get_ILuaPhysicsEnvironment(iStackPos, bError);
+	if (!pLuaEnv->pEnvironment && bError)
 		g_Lua->ThrowError(triedNull_ILuaPhysicsEnvironment.c_str());
 
-	return pEnvironment->pEnvironment;
+	Msg("%p (%s, %i)\n", pLuaEnv->pEnvironment, bError ? "true" : "false", iStackPos);
+
+	return pLuaEnv->pEnvironment;
 }
 
 LUA_FUNCTION_STATIC(physenv_CreateEnvironment)
@@ -374,6 +376,7 @@ LUA_FUNCTION_STATIC(physenv_GetActiveEnvironmentByIndex)
 	return 1;
 }
 
+Symbols::CBaseEntity_VPhysicsDestroyObject func_CBaseEntity_VPhysicsDestroyObject;
 LUA_FUNCTION_STATIC(physenv_DestroyEnvironment)
 {
 	if (!physics)
@@ -383,18 +386,22 @@ LUA_FUNCTION_STATIC(physenv_DestroyEnvironment)
 	CPhysicsEnvironment* pEnvironment = (CPhysicsEnvironment*)pLuaEnv->pEnvironment;
 	if (pLuaEnv->pEnvironment)
 	{
-		int index = -1;
-		for (int i = pEnvironment->m_objects.Count(); --i >= 0; )
+		if (func_CBaseEntity_VPhysicsDestroyObject)
 		{
-			IPhysicsObject* pObject = pEnvironment->m_objects[i];
-			CBaseEntity* pEntity = (CBaseEntity*)pObject->GetGameData();
-			if (pEntity)
+			for (int i = pEnvironment->m_objects.Count(); --i >= 0; )
 			{
-
+				IPhysicsObject* pObject = pEnvironment->m_objects[i];
+				CBaseEntity* pEntity = (CBaseEntity*)pObject->GetGameData();
+				if (pEntity)
+				{
+					//pEntity->VPhysicsUpdate(NULL); // Since the vtables are broken since ~4 functions were removed, this should currently call VPhysicsDestroyObject
+					func_CBaseEntity_VPhysicsDestroyObject(pEntity); // I'm like 100% certain that the workaround above caused some unholy behavior.
+				}
 			}
 		}
 
 		physics->DestroyEnvironment(pEnvironment);
+		pLuaEnv->pEnvironment = NULL;
 	}
 
 	Delete_ILuaPhysicsEnvironment(pLuaEnv);
@@ -1674,12 +1681,10 @@ bool hook_GMod_Util_IsPhysicsObjectValid(IPhysicsObject* obj)
  * NOTE: This only ocurrs when you delete a Environment that still has objects?
  */
 /*Detouring::Hook detour_CBaseEntity_GMOD_VPhysicsTest;
-void* hook_CBaseEntity_GMOD_VPhysicsTest(CBaseEntity* pEnt, IPhysicsObject* obj)
+void hook_CBaseEntity_GMOD_VPhysicsTest(CBaseEntity* pEnt, IPhysicsObject* obj)
 {
 	// NUKE THE FUNCTION for now.
-	void* ret = detour_CBaseEntity_GMOD_VPhysicsTest.GetTrampoline<Symbols::CBaseEntity_GMOD_VPhysicsTest>()(pEnt, obj);
-	Msg("%p\n", ret);
-	return ret;
+	// detour_CBaseEntity_GMOD_VPhysicsTest.GetTrampoline<Symbols::CBaseEntity_GMOD_VPhysicsTest>()(pEnt, obj);
 }*/
 
 /*
@@ -2003,4 +2008,7 @@ void CPhysEnvModule::InitDetour(bool bPreServer)
 
 	func_CBaseEntity_VPhysicsUpdate = (Symbols::CBaseEntity_VPhysicsUpdate)Detour::GetFunction(server_loader.GetModule(), Symbols::CBaseEntity_VPhysicsUpdateSym);
 	Detour::CheckValue("get function", "CBaseEntity::VPhysicsUpdate", func_CBaseEntity_VPhysicsUpdate != NULL);
+
+	func_CBaseEntity_VPhysicsDestroyObject = (Symbols::CBaseEntity_VPhysicsDestroyObject)Detour::GetFunction(server_loader.GetModule(), Symbols::CBaseEntity_VPhysicsDestroyObjectSym);
+	Detour::CheckValue("get function", "CBaseEntity::VPhysicsDestroyObject", func_CBaseEntity_VPhysicsDestroyObject != NULL);
 }
diff --git a/source/symbols.cpp b/source/symbols.cpp
@@ -67,6 +67,10 @@ namespace Symbols
 		Symbol::FromName("_ZN11CBaseEntity17GMOD_VPhysicsTestEP14IPhysicsObject"),
 	};
 
+	const std::vector<Symbol> CBaseEntity_VPhysicsDestroyObjectSym = {
+		Symbol::FromName("_ZN11CBaseEntity21VPhysicsDestroyObjectEv"),
+	};
+
 	const std::vector<Symbol> CGetSym = { // 64x ToDo
 		Symbol::FromName("get"),
 	};

diff --git a/source/symbols.h b/source/symbols.h
@@ -104,9 +104,12 @@ namespace Symbols
 	typedef void (*CBaseEntity_VPhysicsUpdate)(void* fancy_class, void* obj);
 	extern const std::vector<Symbol> CBaseEntity_VPhysicsUpdateSym;
 
-	typedef void* (*CBaseEntity_GMOD_VPhysicsTest)(void* fancy_class, void* obj);
+	typedef void (*CBaseEntity_GMOD_VPhysicsTest)(void* fancy_class, void* obj);
 	extern const std::vector<Symbol> CBaseEntity_GMOD_VPhysicsTestSym;
 
+	typedef void (*CBaseEntity_VPhysicsDestroyObject)(void* fancy_class);
+	extern const std::vector<Symbol> CBaseEntity_VPhysicsDestroyObjectSym;
+
 	extern const std::vector<Symbol> CGetSym;
 
 	//---------------------------------------------------------------------------------

diff --git a/source/util.h b/source/util.h
@@ -196,7 +196,7 @@ struct LuaUserData { // ToDo: Maybe implement this also for other things?
 
 	int iReference = -1;
 	int iTableReference = -1;
-	int pAdditionalData = -1; // Used by HLTVClient.
+	int pAdditionalData = NULL; // Used by HLTVClient.
 };
 
 // This one is special