sirens: Improve hkUsesSiren Hook

Author: AmeerDotEXE

src/features/sirens.cpp

@@ -42,7 +42,7 @@ bool IsValidSirenVehicle(RwFrame *pFrame)
 
 std::map<CVehicle *, bool> sirenExtraUsedFlag;
 
-char __fastcall Sirens::hkUsesSiren(CVehicle *ptr)
+bool Sirens::hkUsesSiren(std::function<hkUsesSirenFunc> originalCall, CVehicle* ptr)
 {
 	if (Util::IsEngineOff(ptr))
 	{
@@ -55,12 +55,13 @@ char __fastcall Sirens::hkUsesSiren(CVehicle *ptr)
 		sirenExtraUsedFlag[ptr] = IsValidSirenVehicle((RwFrame *)ptr->m_pRwClump->object.parent);
 	}
 
-	if (Sirens::modelData.contains(ptr->m_nModelIndex) && sirenExtraUsedFlag[ptr])
+	if (modelData.contains(ptr->m_nModelIndex) && sirenExtraUsedFlag[ptr])
 	{
 		ptr->m_vehicleAudio.m_bModelWithSiren = true;
 		return true;
 	}
-	return ptr->IsLawEnforcementVehicle();
+	
+	return originalCall(ptr);
 }
 
 static ThiscallEvent<AddressList<0x6AAB71, H_CALL>, PRIORITY_BEFORE, ArgPickN<CVehicle*, 0>, void(CVehicle*)> Automobile__PreRenderEvent;
@@ -924,7 +925,8 @@ void Sirens::Init()
 			ModelInfoMgr::EnableSirenMaterial(vehicle, mat.first);
 		} });
 
-	patch::ReplaceFunctionCall(0x6D8492, (void *)hkUsesSiren);
+	using hkUsesSirenHook = injector::function_hooker_thiscall<injector::scoped_call, 0x6D8492, hkUsesSirenFunc>;
+	injector::make_static_hook<hkUsesSirenHook>(hkUsesSiren);
 
 	Automobile__PreRenderEvent += [](CVehicle* pVeh) {
 		pCurrentVeh = pVeh; // Captured for hkAddPointLights()

src/features/sirens.h

@@ -207,10 +207,11 @@ class Sirens : public CBaseFeature
     static inline std::map<int, VehicleSirenData *> modelData;
     static inline std::map<int, std::vector<VehicleDummy *>> modelRotators;
 
+    using hkUsesSirenFunc = bool(CVehicle*);
     using hkRegisterCoronaFunc = void(unsigned int&, CEntity *&, unsigned char&, unsigned char&, unsigned char&, unsigned char&, const CVector&, float&, float&, eCoronaType&, eCoronaFlareType&, bool&, bool&, int&, float&, bool&, float&, unsigned char&, float&, bool&, bool&);
     using hkAddPointLightsFunc = void(unsigned char&, CVector&, CVector&, float&, float&, float&, float&, unsigned char&, bool&, CEntity*&);
 
-    static char __fastcall hkUsesSiren(CVehicle *ptr);
+    static bool hkUsesSiren(std::function<hkUsesSirenFunc> originalCall, CVehicle* ptr);
     static void hkRegisterCorona(std::function<hkRegisterCoronaFunc> originalCall, unsigned int& id, CEntity*& attachTo, unsigned char& red, unsigned char& green, unsigned char& blue, unsigned char& alpha, const CVector& posn, float& radius, float& farClip, eCoronaType& coronaType, eCoronaFlareType& flaretype, bool& enableReflection, bool& checkObstacles, int& _param_not_used, float& angle, bool& longDistance, float& nearClip, unsigned char& fadeState, float& fadeSpeed, bool& onlyFromBelow, bool& reflectionDelay);
     static void hkAddPointLights(std::function<hkAddPointLightsFunc> originalCall, uint8_t& type, CVector& position, CVector& direction, float& range, float& red, float& green, float& blue, uint8_t& fogEffect, bool& bCastsShadowFromPlayerCarAndPed, CEntity*& castingEntity);