Syntax update

Author: FileEX

Client/game_sa/CWorldSA.cpp

@@ -77,21 +77,6 @@ bool CWorldSA::ResetSurfaceInfo(short sSurfaceID)
     return false;
 }
 
-CEntity* CWorldSA::TestSphereAgainstWorld(const CVector& sphereCenter, float radius, CEntity* ignoredEntity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool cameraIgnore, STestSphereAgainstWorldResult& result)
-{
-    auto entity = ((CEntitySAInterface*(__cdecl*)(CVector, float, CEntitySAInterface*, bool, bool, bool, bool, bool, bool))FUNC_CWorld_TestSphereAgainstWorld)(sphereCenter, radius, ignoredEntity ? ignoredEntity->GetInterface() : nullptr, checkBuildings, checkVehicles, checkPeds, checkObjects, checkDummies, cameraIgnore);
-    if (!entity)
-        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;
-
-    return pGame->GetPools()->GetEntity(reinterpret_cast<DWORD*>(entity));
-}
-
 void HOOK_FallenPeds();
 void HOOK_FallenCars();
 
@@ -543,6 +528,23 @@ bool CWorldSA::ProcessLineOfSight(const CVector* vecStart, const CVector* vecEnd
     return bReturn;
 }
 
+CEntity* CWorldSA::TestSphereAgainstWorld(const CVector& sphereCenter, float radius, CEntity* ignoredEntity, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool cameraIgnore, STestSphereAgainstWorldResult& result)
+{
+    auto entity = ((CEntitySAInterface*(__cdecl*)(CVector, float, CEntitySAInterface*, bool, bool, bool, bool, bool, bool))FUNC_CWorld_TestSphereAgainstWorld)(sphereCenter, radius, ignoredEntity ? ignoredEntity->GetInterface() : nullptr, checkBuildings, checkVehicles, checkPeds, checkObjects, checkDummies, cameraIgnore);
+    if (!entity)
+        return nullptr;
+    
+    result.collisionDetected = true;
+    result.modelID = entity->m_nModelIndex;
+    result.entityPosition = entity->Placeable.matrix->vPos;
+    ConvertMatrixToEulerAngles(*entity->Placeable.matrix, result.entityRotation.fX, result.entityRotation.fY, result.entityRotation.fZ);
+    result.entityRotation = -result.entityRotation;
+    result.lodID = entity->m_pLod ? entity->m_pLod->m_nModelIndex : 0;
+    result.type = entity->nType;
+
+    return pGame->GetPools()->GetEntity(reinterpret_cast<DWORD*>(entity));
+}
+
 void CWorldSA::IgnoreEntity(CEntity* pEntity)
 {
     CEntitySA* pEntitySA = dynamic_cast<CEntitySA*>(pEntity);

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -910,6 +910,16 @@ ADD_ENUM(PreloadAreaOption::COLLISIONS, "collisions")
 ADD_ENUM(PreloadAreaOption::ALL, "all")
 IMPLEMENT_ENUM_CLASS_END("preload-area-option")
 
+IMPLEMENT_ENUM_BEGIN(eEntityType)
+ADD_ENUM(ENTITY_TYPE_NOTHING, "unknown")
+ADD_ENUM(ENTITY_TYPE_BUILDING, "building")
+ADD_ENUM(ENTITY_TYPE_VEHICLE, "vehicle")
+ADD_ENUM(ENTITY_TYPE_PED, "ped")
+ADD_ENUM(ENTITY_TYPE_OBJECT, "object")
+ADD_ENUM(ENTITY_TYPE_DUMMY, "dummy")
+ADD_ENUM(ENTITY_TYPE_NOTINPOOLS, "unknown")
+IMPLEMENT_ENUM_END("entity-type")
+
 //
 // CResource from userdata
 //

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h

@@ -88,6 +88,7 @@ DECLARE_ENUM(ePools);
 DECLARE_ENUM(eWorldProperty);
 DECLARE_ENUM_CLASS(eModelLoadState);
 DECLARE_ENUM_CLASS(PreloadAreaOption);
+DECLARE_ENUM(eEntityType);
 
 class CRemoteCall;
 

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*, 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)
+CLuaMultiReturn<bool, CClientEntity*, int, float, float, float, float, float, float, int, eEntityType> 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*, float, float, float, int, int, int> CLuaWo
     if (entity)
         collidedEntity = reinterpret_cast<CClientEntity*>(entity->GetStoredPointer());
 
-    return {result.collisionDetected, collidedEntity, result.hitPosition.fX, result.hitPosition.fY, result.hitPosition.fZ, result.modelID, result.lodID, result.type};
+    return {result.collisionDetected, collidedEntity, result.modelID, result.entityPosition.fX, result.entityPosition.fY, result.entityPosition.fZ, ConvertRadiansToDegrees(result.entityRotation.fX), ConvertRadiansToDegrees(result.entityRotation.fY), ConvertRadiansToDegrees(result.entityRotation.fZ), result.lodID, static_cast<eEntityType>(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*, 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);
+    static CLuaMultiReturn<bool, CClientEntity*, int, float, float, float, float, float, float, int, eEntityType> 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,8 +64,9 @@ struct SProcessLineOfSightMaterialInfoResult {
 struct STestSphereAgainstWorldResult
 {
     bool           collisionDetected{false};
-    CVector        hitPosition{};
     std::uint32_t  modelID{0};
+    CVector        entityPosition{};
+    CVector        entityRotation{};
     std::uint32_t  lodID{0};
     std::uint8_t   type{0};
 };