hitPosition

Author: FileEX

Client/game_sa/CWorldSA.cpp

@@ -84,6 +84,7 @@ CEntity* CWorldSA::TestSphereAgainstWorld(const CVector& sphereCenter, float rad
         return nullptr;
 
     result.collisionDetected = true;
+    result.hitPosition = entity->Placeable.matrix->vPos;
     result.modelID = entity->m_nModelIndex;
     result.type = entity->nType;
     result.lodID = entity->m_pLod ? entity->m_pLod->m_nModelIndex : 0;

Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp

@@ -2280,7 +2280,7 @@ void CLuaWorldDefs::ResetWorldProperties(std::optional<bool> resetSpecialWorldPr
     g_pClientGame->ResetWorldProperties(ResetWorldPropsInfo{resetSpecialWorldProperties.value_or(true), resetWorldProperties.value_or(true), resetWeatherProperties.value_or(true), resetLODs.value_or(true), resetSounds.value_or(true)});
 }
 
-CLuaMultiReturn<bool, CClientEntity*, int, int, int> CLuaWorldDefs::TestSphereAgainstWorld(CVector sphereCenter, float radius, std::optional<CClientEntity*> ignoredEntity, std::optional<bool> checkBuildings, std::optional<bool> checkVehicles, std::optional<bool> checkPeds, std::optional<bool> checkObjects, std::optional<bool> checkDummies, std::optional<bool> cameraIgnore)
+CLuaMultiReturn<bool, CClientEntity*, float, float, float, int, int, int> CLuaWorldDefs::TestSphereAgainstWorld(CVector sphereCenter, float radius, std::optional<CClientEntity*> ignoredEntity, std::optional<bool> checkBuildings, std::optional<bool> checkVehicles, std::optional<bool> checkPeds, std::optional<bool> checkObjects, std::optional<bool> checkDummies, std::optional<bool> cameraIgnore)
 {
     STestSphereAgainstWorldResult result;
     CClientEntity* collidedEntity = nullptr;
@@ -2289,5 +2289,5 @@ CLuaMultiReturn<bool, CClientEntity*, int, int, int> CLuaWorldDefs::TestSphereAg
     if (entity)
         collidedEntity = reinterpret_cast<CClientEntity*>(entity->GetStoredPointer());
 
-    return {result.collisionDetected, collidedEntity, result.modelID, result.lodID, result.type};
+    return {result.collisionDetected, collidedEntity, result.hitPosition.fX, result.hitPosition.fY, result.hitPosition.fZ, result.modelID, result.lodID, result.type};
 }

Client/mods/deathmatch/logic/luadefs/CLuaWorldDefs.h

@@ -141,7 +141,7 @@ class CLuaWorldDefs : public CLuaDefs
 
     static void ResetWorldProperties(std::optional<bool> resetSpecialWorldProperties, std::optional<bool> resetWorldProperties, std::optional<bool> resetWeatherProperties, std::optional<bool> resetLODs, std::optional<bool> resetSounds) noexcept;
 
-    static CLuaMultiReturn<bool, CClientEntity*, int, int, int> TestSphereAgainstWorld(CVector sphereCenter, float radius, std::optional<CClientEntity*> ignoredEntity, std::optional<bool> checkBuildings, std::optional<bool> checkVehicles, std::optional<bool> checkPeds, std::optional<bool> checkObjects, std::optional<bool> checkDummies, std::optional<bool> cameraIgnore);
+    static CLuaMultiReturn<bool, CClientEntity*, float, float, float, int, int, int> TestSphereAgainstWorld(CVector sphereCenter, float radius, std::optional<CClientEntity*> ignoredEntity, std::optional<bool> checkBuildings, std::optional<bool> checkVehicles, std::optional<bool> checkPeds, std::optional<bool> checkObjects, std::optional<bool> checkDummies, std::optional<bool> cameraIgnore);
 
 };
 

Client/sdk/game/CWorld.h

@@ -64,6 +64,7 @@ struct SProcessLineOfSightMaterialInfoResult {
 struct STestSphereAgainstWorldResult
 {
     bool           collisionDetected{false};
+    CVector        hitPosition{};
     std::uint32_t  modelID{0};
     std::uint32_t  lodID{0};
     std::uint8_t   type{0};