physenv: try to fix it crashing on 64x

RaphaelIT7 · RaphaelIT7 · commit 87b8ee9ed2f1 · 2025-10-23T19:02:19.000+02:00
diff --git a/source/modules/physenv.cpp b/source/modules/physenv.cpp
@@ -843,6 +843,7 @@ void hook_CPhysicsEnvironment_DestroyObject(GMODSDK::CPhysicsEnvironment* pEnvir
 		return;
 	}
 
+#if ARCHITECTURE_X86
 	pEnv->m_objects.FastRemove(foundIndex);
 
 	UnregisterPhysicsObject(pLuaEnvironment, pObject);
@@ -866,6 +867,11 @@ void hook_CPhysicsEnvironment_DestroyObject(GMODSDK::CPhysicsEnvironment* pEnvir
 		pEnv->m_pSleepEvents->DeleteObject(pPhysics);
 		delete pObject;
 	}
+#else // Required since 64x uses a different vphysics build and we don't want to corrupt member variables of the CPhysicsEnvironment
+	detour_CPhysicsEnvironment_DestroyObject.GetTrampoline<Symbols::CPhysicsEnvironment_DestroyObject>()(pEnv, pObject);
+
+	UnregisterPhysicsObject(pLuaEnvironment, pObject);
+#endif
 }
 
 static Detouring::Hook detour_CPhysicsEnvironment_Restore;

Original file line number	Diff line number	Diff line change
`@@ -843,6 +843,7 @@ void hook_CPhysicsEnvironment_DestroyObject(GMODSDK::CPhysicsEnvironment* pEnvir`
`843`	`843`	`return;`
`844`	`844`	`}`
`845`	`845`
	`846`	`+#if ARCHITECTURE_X86`
`846`	`847`	`pEnv->m_objects.FastRemove(foundIndex);`
`847`	`848`
`848`	`849`	`UnregisterPhysicsObject(pLuaEnvironment, pObject);`
`@@ -866,6 +867,11 @@ void hook_CPhysicsEnvironment_DestroyObject(GMODSDK::CPhysicsEnvironment* pEnvir`
`866`	`867`	`pEnv->m_pSleepEvents->DeleteObject(pPhysics);`
`867`	`868`	`delete pObject;`
`868`	`869`	`}`
	`870`	`+#else // Required since 64x uses a different vphysics build and we don't want to corrupt member variables of the CPhysicsEnvironment`
	`871`	`+ detour_CPhysicsEnvironment_DestroyObject.GetTrampoline<Symbols::CPhysicsEnvironment_DestroyObject>()(pEnv, pObject);`
	`872`	`+`
	`873`	`+ UnregisterPhysicsObject(pLuaEnvironment, pObject);`
	`874`	`+#endif`
`869`	`875`	`}`
`870`	`876`
`871`	`877`	`static Detouring::Hook detour_CPhysicsEnvironment_Restore;`