tweak(extra-natives/five): Change native name: PASSENGER_WEIGHT -> GL…

…OBAL_PASSENGER_MASS_MULTIPLIER tweak(native-docs): Add information aboud default value feat(extra-natives/five): Reset passenger mass OnKillNetwork tweak(extra-natives/five): Change native name PASSENGER_WEIGHT -> GLOBAL_PASSENGER_MASS_MULTIPLIER
citizenfx · Sep 19, 2024 · 341dcc5 · 341dcc5
1 parent 11c4e85
commit 341dcc5
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 37 deletions.
diff --git a/code/components/extra-natives-five/src/VehicleExtraNatives.cpp b/code/components/extra-natives-five/src/VehicleExtraNatives.cpp
@@ -236,7 +236,7 @@ static void writeVehicleMemory(fx::ScriptContext& context, std::string_view nn)
 	}
 }
 
-static float* PassengerWeightPtr;
+static float* PassengerMassPtr;
 
 static int StreamRenderGfxPtrOffset;
 static int HandlingDataPtrOffset;
@@ -757,7 +757,7 @@ static HookFunction initFunction([]()
 
 	{
 		auto location = hook::get_pattern<char>("F3 0F 59 3D ? ? ? ? F3 0F 58 3D ? ? ? ? 48 85 C9", 4);
-		PassengerWeightPtr = hook::get_address<float*>(location);
+		PassengerMassPtr = hook::get_address<float*>(location);
 	}
 
 	{
@@ -1525,21 +1525,23 @@ static HookFunction initFunction([]()
 		ResetFlyThroughWindscreenParams();
 	});
 
-	fx::ScriptEngine::RegisterNativeHandler("SET_PASSENGER_WEIGHT", [](fx::ScriptContext& context)
+	fx::ScriptEngine::RegisterNativeHandler("SET_GLOBAL_PASSENGER_MASS_MULTIPLIER", [](fx::ScriptContext& context)
 	{
 		float weight = context.GetArgument<float>(0);
 
 		if (weight < 0.0)
 		{
 			weight = 0.0;
 		}
-
-		*PassengerWeightPtr = weight;
+		trace("Setting weight %.6f was %.6f\n", weight, *PassengerMassPtr);
+		*PassengerMassPtr = weight;
 	});
 
-	fx::ScriptEngine::RegisterNativeHandler("GET_PASSENGER_WEIGHT", [](fx::ScriptContext& context)
+	fx::ScriptEngine::RegisterNativeHandler("GET_GLOBAL_PASSENGER_MASS_MULTIPLIER", [](fx::ScriptContext& context)
 	{
-		context.SetResult<float>(* PassengerWeightPtr);
+		trace("Weight is %.6f\n", *PassengerMassPtr);
+
+		context.SetResult<float>(*PassengerMassPtr);
 	});
 
 	static struct : jitasm::Frontend
@@ -1619,6 +1621,8 @@ static HookFunction initFunction([]()
 
 		g_isFuelConsumptionOn = false;
 		g_globalFuelConsumptionMultiplier = 1.f;
+
+		*PassengerMassPtr = 0.05f;
 	});
 
 	fx::ScriptEngine::RegisterNativeHandler("SET_VEHICLE_AUTO_REPAIR_DISABLED", [](fx::ScriptContext& context)

diff --git a/ext/native-decls/GetGlobalPassengerMassMultiplier.md b/ext/native-decls/GetGlobalPassengerMassMultiplier.md
@@ -0,0 +1,15 @@
+---
+ns: CFX
+apiset: client
+game: gta5
+---
+## GET_GLOBAL_PASSENGER_MASS_MULTIPLIER
+
+```c
+float GET_GLOBAL_PASSENGER_MASS_MULTIPLIER();
+```
+
+A getter for [SET_GLOBAL_PASSENGER_MASS_MULTIPLIER](#_0x1c47f6ac).
+
+## Return value
+Returns the mass of each passenger (not counting the driver) as a percentage of vehicle mass. Default value is 0.05
diff --git a/ext/native-decls/GetPassengerWeight.md b/ext/native-decls/GetPassengerWeight.md
diff --git a/ext/native-decls/SetGlobalPassengerMassMultiplier.md b/ext/native-decls/SetGlobalPassengerMassMultiplier.md
@@ -0,0 +1,15 @@
+---
+ns: CFX
+apiset: client
+game: gta5
+---
+## SET_GLOBAL_PASSENGER_MASS_MULTIPLIER
+
+```c
+void SET_GLOBAL_PASSENGER_MASS_MULTIPLIER(float massMul);
+```
+
+## Parameters
+* **massMul**: Weight of each passenger (not counting the driver) as a percentage of vehicle mass. Is applied to all vehicles. Default value is 0.05
+
+## Return value
diff --git a/ext/native-decls/SetPassengerWeight.md b/ext/native-decls/SetPassengerWeight.md