feat(extra-natives-rdr3): Add GET_VEHICLE_ADDITIONAL_PROP_SET_HASH native

Author: Identity-labs

code/components/extra-natives-five/src/PoolTraversalNatives.cpp

@@ -8,7 +8,7 @@
 #include <Pool.h>
 
 #ifdef IS_RDR3
-#include <NativeWrappers.h>
+#include <EntitySystem.h>
 #endif
 
 #include <Local.h>

code/components/extra-natives-rdr3/include/NativeWrappers.h

@@ -1,47 +1 @@
-#pragma once
-
-#include "StdInc.h"
-
-class fwEntity
-{
-public:
-	virtual ~fwEntity() = 0;
-
-	virtual bool IsOfType(uint32_t hash) = 0;
-
-	template<typename T>
-	bool IsOfType()
-	{
-		return reinterpret_cast<T*>(this->IsOfType(HashString(boost::typeindex::type_id<T>().pretty_name().substr(6).c_str())));
-	}
-
-	inline void* GetNetObject() const
-	{
-		static_assert(offsetof(fwEntity, m_netObject) == 224, "wrong GetNetObject");
-		return m_netObject;
-	}
-
-private:
-	char m_pad[216];
-	void* m_netObject;
-};
-
-class CPickup : public fwEntity
-{
-
-};
-
-class CObject : public fwEntity
-{
-
-};
-
-class CVehicle : public fwEntity
-{
-
-};
-
-class CPed : public fwEntity
-{
-
-};
+#pragma once

code/components/extra-natives-rdr3/src/DoorExtraNatives.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "StdInc.h"
-#include "NativeWrappers.h"
+#include "EntitySystem.h"
 
 #include <ScriptEngine.h>
 #include <ScriptSerialization.h>

code/components/extra-natives-rdr3/src/VehicleNatives.cpp

@@ -1,10 +1,52 @@
 #include <StdInc.h>
 #include <ScriptEngine.h>
+#include <EntitySystem.h>
 
 #include <Hooking.h>
+#include <Pool.h>
 
 #include <GameInit.h>
 
+static fwEntity* getAndCheckVehicle(fx::ScriptContext& context, std::string_view name)
+{
+    auto traceFn = [name](std::string_view msg)
+    {
+        trace("%s: %s\n", name, msg);
+    };
+
+    if (context.GetArgumentCount() < 1)
+    {
+        traceFn("At least one argument must be passed");
+        return nullptr;
+    }
+
+    fwEntity* vehicle = rage::fwScriptGuid::GetBaseFromGuid(context.GetArgument<int>(0));
+
+    if (!vehicle)
+    {
+        traceFn("No such entity");
+        return nullptr;
+    }
+
+    if (!vehicle->IsOfType<CVehicle>())
+    {
+        traceFn("Can not read from an entity that is not a vehicle or draft vehicle");
+        return nullptr;
+    }
+
+    return vehicle;
+}
+
+static hook::FlexStruct* getAndCheckVehicleFlexStruct(fx::ScriptContext& context, std::string_view name)
+{
+    fwEntity* vehicle = getAndCheckVehicle(context, name);
+    if (!vehicle)
+    {
+        return nullptr;
+    }
+    return reinterpret_cast<hook::FlexStruct*>(vehicle);
+}
+
 static bool g_ignoreVehicleOwnershipChecksForStowing = false;
 
 static bool (*g_origIsAllowedToInteractWithHuntingWagon)(void*, bool);
@@ -16,6 +58,24 @@ static bool IsAllowedToInteractWithHuntingWagon(void* entity, bool ownershipChec
 
 static bool (*origGetPedOfPlayerOwnerOfNetworkObject)(void* pNetObj);
 
+static InitFunction initFunction([]()
+{
+
+    fx::ScriptEngine::RegisterNativeHandler("GET_VEHICLE_ADDITIONAL_PROP_SET_HASH", [](fx::ScriptContext& context)
+    {
+        if (hook::FlexStruct* flexStruct = getAndCheckVehicleFlexStruct(context, "GET_VEHICLE_ADDITIONAL_PROP_SET_HASH"))
+        {
+            uint32_t propSetHash = flexStruct->Get<uint32_t>(0xD90);
+            context.SetResult(propSetHash);
+        }
+        else
+        {
+            context.SetResult(0);
+        }
+    });
+
+});
+
 static HookFunction hookFunction([]()
 {
 	{

code/components/gta-streaming-rdr3/include/EntitySystem.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <directxmath.h>
+#include <boost/type_index/ctti_type_index.hpp>
+#include "StdInc.h"
 
 #ifdef COMPILING_GTA_STREAMING_RDR3
 #define STREAMING_EXPORT DLL_EXPORT
@@ -99,7 +101,27 @@ class STREAMING_EXPORT fwEntity : public rage::fwRefAwareBase
 public:
 	virtual ~fwEntity() = default;
 
-	virtual bool IsOfType(uint32_t hash) = 0;
+	inline bool IsOfType(uint32_t hash) {
+		return IsOfTypeH(hash);
+	}
+
+	template<typename T>
+	bool IsOfType()
+	{
+		auto typeName = std::string_view{
+			boost::typeindex::ctti_type_index::type_id<T>().raw_name()
+		};
+
+		// Parse mangled name like "class CVehicle>::n(void) noexcept"
+		auto className = typeName.substr(6);
+		size_t endPos = className.find('>');
+		if (endPos != std::string_view::npos) {
+			className = className.substr(0, endPos);
+		}
+		
+		auto typeHash = HashString(className);
+		return this->IsOfType(typeHash);
+	}
 
 private:
 	template<typename TMember>
@@ -129,6 +151,9 @@ class STREAMING_EXPORT fwEntity : public rage::fwRefAwareBase
 	void** vtbl = *(void***)(this); \
 	return (this->*(get_member<TFn>(vtbl[(offset / 8)])))(__VA_ARGS__);
 
+private:
+	bool IsOfTypeH(uint32_t hash);
+
 public:
 	inline float GetRadius()
 	{

code/components/gta-streaming-rdr3/src/EntitySystem.cpp

@@ -22,3 +22,9 @@ fwArchetype* rage::fwArchetypeManager::GetArchetypeFromHashKey(uint32_t hash, fw
 {
 	return getArchetype(hash, id);
 }
+
+bool fwEntity::IsOfTypeH(uint32_t hash)
+{
+	hook::FlexStruct* flexStruct = reinterpret_cast<hook::FlexStruct*>(this);
+	return flexStruct->CallVirtual<bool, const uint32_t&>(sizeof(void*), hash);
+}

ext/native-decls/GetVehicleAdditionalPropSetHash.md

@@ -0,0 +1,33 @@
+---
+ns: CFX
+apiset: client
+game: rdr3
+---
+## GET_VEHICLE_ADDITIONAL_PROP_SET_HASH
+
+```c
+int GET_VEHICLE_ADDITIONAL_PROP_SET_HASH(Vehicle vehicle);
+```
+
+Gets the additional prop set hash for the specified vehicle.
+
+## Parameters
+* **vehicle**: The vehicle's entity handle.
+
+## Return value
+Returns the additional prop set hash, or 0 if the vehicle is invalid.
+
+## Examples
+```lua
+local vehicle = GetVehiclePedIsIn(PlayerPedId(), false)
+if vehicle ~= 0 then
+    local propSetHash = GetVehicleAdditionalPropSetHash(vehicle)
+    print("Additional Prop Set Hash: " .. propSetHash)
+end
+```
+
+## Notes
+- The vehicle must be a valid entity and must be of type CVehicle
+- Returns 0 if the vehicle handle is invalid or the entity is not a vehicle
+- The hash value can be used to identify specific prop sets applied to vehicles
+