Review

FileEX · FileEX · commit 722510117578 · 2025-08-10T19:12:57.000+02:00
diff --git a/Client/game_sa/CAutomobileSA.cpp b/Client/game_sa/CAutomobileSA.cpp
@@ -15,6 +15,9 @@
 
 extern CGameSA* pGame;
 
+using namespace CarNodes;
+using namespace VehicleFeatures;
+
 CAutomobileSA::CAutomobileSA(CAutomobileSAInterface* pInterface)
 {
     SetInterface(pInterface);
@@ -47,7 +50,7 @@ void CAutomobileSAInterface::SetPanelDamage(std::uint8_t panelId, bool breakGlas
             if ((pHandlingData->uiModelFlags & 0x10000000) != 0) // check bouncePanels flag
                 return;
 
-            if (node != CarNodes::Enum::WINDSCREEN && node != CarNodes::Enum::WING_LF && node != CarNodes::Enum::WING_RF)
+            if (node != WINDSCREEN && node != WING_LF && node != WING_RF)
             {
                 // Get free bouncing panel
                 for (auto& panel : m_panels)
@@ -99,17 +102,17 @@ void CAutomobileSA::PreRender_End(CAutomobileSAInterface* vehicleInterface)
         return;
 
     // Simple turret like in fire truck
-    if (vehicle->pEntity->IsSpecialFeatureEnabled(VehicleFeatures::Enum::WATER_CANNON) && !vehicle->pEntity->IsSpecialFeatureEnabled(VehicleFeatures::Enum::TURRET))
+    if (vehicle->pEntity->IsSpecialFeatureEnabled(WATER_CANNON) && !vehicle->pEntity->IsSpecialFeatureEnabled(TURRET))
     {
-        CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[CarNodes::MISC_A], eComponentRotationAxis::AXIS_X, vehicleInterface->m_fDoomHorizontalRotation, true);
-        CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[CarNodes::MISC_A], eComponentRotationAxis::AXIS_Z, vehicleInterface->m_fDoomVerticalRotation, false);
+        CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[MISC_A], eComponentRotationAxis::AXIS_X, vehicleInterface->m_fDoomHorizontalRotation, true);
+        CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[MISC_A], eComponentRotationAxis::AXIS_Z, vehicleInterface->m_fDoomVerticalRotation, false);
     }
 
     // Turret like rhino or swat van
-    if (vehicle->pEntity->IsSpecialFeatureEnabled(VehicleFeatures::Enum::TURRET))
+    if (vehicle->pEntity->IsSpecialFeatureEnabled(TURRET))
     {
-        CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[CarNodes::MISC_A], eComponentRotationAxis::AXIS_Z, vehicleInterface->m_fDoomVerticalRotation, true);
-        CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[CarNodes::MISC_B], eComponentRotationAxis::AXIS_X, vehicleInterface->m_fDoomHorizontalRotation, true);
+        CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[MISC_A], eComponentRotationAxis::AXIS_Z, vehicleInterface->m_fDoomVerticalRotation, true);
+        CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[MISC_B], eComponentRotationAxis::AXIS_X, vehicleInterface->m_fDoomHorizontalRotation, true);
     }
 }
 
@@ -124,12 +127,11 @@ bool CAutomobileSA::HasFeatureEnabled(CAutomobileSAInterface* vehicleInterface,
 
 static constexpr std::uintptr_t SKIIP_FIRE_TRUCK = 0x6B1F77;
 static constexpr std::uintptr_t CONTINUE_FIRE_TRUCK = 0x6B1F5B;
-static constexpr VehicleFeatures::Enum WATER_CANNON_ID = VehicleFeatures::Enum::WATER_CANNON;
 static void _declspec(naked) HOOK_CAutomobile_ProcessControl_FireTruckCheck()
 {
     _asm
     {
-        push WATER_CANNON_ID
+        push WATER_CANNON
         push esi
         call CAutomobileSA::HasFeatureEnabled
         add esp, 8
diff --git a/Client/game_sa/CGameSA.h b/Client/game_sa/CGameSA.h
@@ -323,8 +323,8 @@ class CGameSA : public CGame
 
     bool SetBuildingPoolSize(size_t size);
 
-    bool SetVehicleModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature, bool enabled) override { return CVehicleSA::SetModelSpecialFeatureEnabled(model, feature, enabled); };
-    bool IsVehicleModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature) const override { return CVehicleSA::IsModelSpecialFeatureEnabled(model, feature); };
+    bool SetVehicleModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature, bool enabled) override { return CVehicleSA::SetModelSpecialFeatureEnabled(model, feature, enabled); };
+    bool IsVehicleModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature) const override { return CVehicleSA::IsModelSpecialFeatureEnabled(model, feature); };
 
     ModelFeaturesArray GetModelSpecialFeatures(std::uint16_t model) const noexcept override { return CVehicleSA::GetModelSpecialFeatures(model); }
 
diff --git a/Client/game_sa/CVehicleSA.cpp b/Client/game_sa/CVehicleSA.cpp
@@ -2422,7 +2422,7 @@ void CVehicleSA::ReinitAudio()
         audioInterface->SoundJoin();
 }
 
-bool CVehicleSA::SetSpecialFeatureEnabled(const VehicleFeatures::Enum& feature, bool enabled)
+bool CVehicleSA::SetSpecialFeatureEnabled(VehicleFeatures::Enum feature, bool enabled)
 {
     CVehicleSAInterface* vehicleInterface = GetVehicleInterface();
 
@@ -2443,21 +2443,23 @@ bool CVehicleSA::SetSpecialFeatureEnabled(const VehicleFeatures::Enum& feature,
     return true;
 }
 
-bool CVehicleSA::SetModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature, bool enabled)
+bool CVehicleSA::SetModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature, bool enabled)
 {
     CModelInfo* modelInfo = pGame->GetModelInfo(model);
     if (!modelInfo)
         return false;
 
     if (feature == VehicleFeatures::Enum::WATER_CANNON)
+    {
         if (static_cast<VehicleClass>(modelInfo->GetVehicleType()) != VehicleClass::AUTOMOBILE)
             return false;
+    }
 
     m_modelSpecialFeatures[model][feature] = enabled;
     return true;
 }
 
-bool CVehicleSA::IsModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature)
+bool CVehicleSA::IsModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature)
 {
     auto it = m_modelSpecialFeatures.find(model);
     return it == m_modelSpecialFeatures.end() ? false : it->second[feature];
diff --git a/Client/game_sa/CVehicleSA.h b/Client/game_sa/CVehicleSA.h
@@ -730,11 +730,11 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
 
     void SetSpecialFeaturesEnabled(const ModelFeaturesArray& features) noexcept { m_specialFeatures = features; }
 
-    bool SetSpecialFeatureEnabled(const VehicleFeatures::Enum& feature, bool enabled) override;
-    bool IsSpecialFeatureEnabled(const VehicleFeatures::Enum& feature) const noexcept override { return m_specialFeatures[feature]; }
+    bool SetSpecialFeatureEnabled(VehicleFeatures::Enum feature, bool enabled) override;
+    bool IsSpecialFeatureEnabled(VehicleFeatures::Enum feature) const noexcept override { return m_specialFeatures[feature]; }
 
-    static bool SetModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature, bool enabled);
-    static bool IsModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature);
+    static bool SetModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature, bool enabled);
+    static bool IsModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature);
 
     static ModelFeaturesArray GetModelSpecialFeatures(std::uint16_t model);
 
diff --git a/Client/sdk/game/CGame.h b/Client/sdk/game/CGame.h
@@ -289,8 +289,8 @@ class __declspec(novtable) CGame
 
     virtual bool SetBuildingPoolSize(size_t size) = 0;
 
-    virtual bool SetVehicleModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature, bool enabled) = 0;
-    virtual bool IsVehicleModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature) const = 0;
+    virtual bool SetVehicleModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature, bool enabled) = 0;
+    virtual bool IsVehicleModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature) const = 0;
 
     virtual std::array<bool, VehicleFeatures::Enum::MAX_FEATURES> GetModelSpecialFeatures(std::uint16_t model) const noexcept = 0;
 
diff --git a/Client/sdk/game/CVehicle.h b/Client/sdk/game/CVehicle.h
@@ -338,6 +338,6 @@ class CVehicle : public virtual CPhysical
 
     virtual void SetSpecialFeaturesEnabled(const ModelFeaturesArray& features) noexcept = 0;
 
-    virtual bool SetSpecialFeatureEnabled(const VehicleFeatures::Enum& feature, bool enabled) = 0;
-    virtual bool IsSpecialFeatureEnabled(const VehicleFeatures::Enum& feature) const noexcept = 0;
+    virtual bool SetSpecialFeatureEnabled(VehicleFeatures::Enum feature, bool enabled) = 0;
+    virtual bool IsSpecialFeatureEnabled(VehicleFeatures::Enum feature) const noexcept = 0;
 };

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`
`16`	`16`	`extern CGameSA* pGame;`
`17`	`17`
	`18`	`+using namespace CarNodes;`
	`19`	`+using namespace VehicleFeatures;`
	`20`	`+`
`18`	`21`	`CAutomobileSA::CAutomobileSA(CAutomobileSAInterface* pInterface)`
`19`	`22`	`{`
`20`	`23`	`SetInterface(pInterface);`
`@@ -47,7 +50,7 @@ void CAutomobileSAInterface::SetPanelDamage(std::uint8_t panelId, bool breakGlas`
`47`	`50`	`if ((pHandlingData->uiModelFlags & 0x10000000) != 0) // check bouncePanels flag`
`48`	`51`	`return;`
`49`	`52`
`50`		`- if (node != CarNodes::Enum::WINDSCREEN && node != CarNodes::Enum::WING_LF && node != CarNodes::Enum::WING_RF)`
	`53`	`+ if (node != WINDSCREEN && node != WING_LF && node != WING_RF)`
`51`	`54`	`{`
`52`	`55`	`// Get free bouncing panel`
`53`	`56`	`for (auto& panel : m_panels)`
`@@ -99,17 +102,17 @@ void CAutomobileSA::PreRender_End(CAutomobileSAInterface* vehicleInterface)`
`99`	`102`	`return;`
`100`	`103`
`101`	`104`	`// Simple turret like in fire truck`
`102`		`- if (vehicle->pEntity->IsSpecialFeatureEnabled(VehicleFeatures::Enum::WATER_CANNON) && !vehicle->pEntity->IsSpecialFeatureEnabled(VehicleFeatures::Enum::TURRET))`
	`105`	`+ if (vehicle->pEntity->IsSpecialFeatureEnabled(WATER_CANNON) && !vehicle->pEntity->IsSpecialFeatureEnabled(TURRET))`
`103`	`106`	`{`
`104`		`- CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[CarNodes::MISC_A], eComponentRotationAxis::AXIS_X, vehicleInterface->m_fDoomHorizontalRotation, true);`
`105`		`- CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[CarNodes::MISC_A], eComponentRotationAxis::AXIS_Z, vehicleInterface->m_fDoomVerticalRotation, false);`
	`107`	`+ CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[MISC_A], eComponentRotationAxis::AXIS_X, vehicleInterface->m_fDoomHorizontalRotation, true);`
	`108`	`+ CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[MISC_A], eComponentRotationAxis::AXIS_Z, vehicleInterface->m_fDoomVerticalRotation, false);`
`106`	`109`	`}`
`107`	`110`
`108`	`111`	`// Turret like rhino or swat van`
`109`		`- if (vehicle->pEntity->IsSpecialFeatureEnabled(VehicleFeatures::Enum::TURRET))`
	`112`	`+ if (vehicle->pEntity->IsSpecialFeatureEnabled(TURRET))`
`110`	`113`	`{`
`111`		`- CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[CarNodes::MISC_A], eComponentRotationAxis::AXIS_Z, vehicleInterface->m_fDoomVerticalRotation, true);`
`112`		`- CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[CarNodes::MISC_B], eComponentRotationAxis::AXIS_X, vehicleInterface->m_fDoomHorizontalRotation, true);`
	`114`	`+ CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[MISC_A], eComponentRotationAxis::AXIS_Z, vehicleInterface->m_fDoomVerticalRotation, true);`
	`115`	`+ CVehicleSA::SetComponentRotation(vehicleInterface->m_aCarNodes[MISC_B], eComponentRotationAxis::AXIS_X, vehicleInterface->m_fDoomHorizontalRotation, true);`
`113`	`116`	`}`
`114`	`117`	`}`
`115`	`118`
`@@ -124,12 +127,11 @@ bool CAutomobileSA::HasFeatureEnabled(CAutomobileSAInterface* vehicleInterface,`
`124`	`127`
`125`	`128`	`static constexpr std::uintptr_t SKIIP_FIRE_TRUCK = 0x6B1F77;`
`126`	`129`	`static constexpr std::uintptr_t CONTINUE_FIRE_TRUCK = 0x6B1F5B;`
`127`		`-static constexpr VehicleFeatures::Enum WATER_CANNON_ID = VehicleFeatures::Enum::WATER_CANNON;`
`128`	`130`	`static void _declspec(naked) HOOK_CAutomobile_ProcessControl_FireTruckCheck()`
`129`	`131`	`{`
`130`	`132`	`_asm`
`131`	`133`	`{`
`132`		`- push WATER_CANNON_ID`
	`134`	`+ push WATER_CANNON`
`133`	`135`	`push esi`
`134`	`136`	`call CAutomobileSA::HasFeatureEnabled`
`135`	`137`	`add esp, 8`
Original file line number	Diff line number	Diff line change
`@@ -2422,7 +2422,7 @@ void CVehicleSA::ReinitAudio()`
`2422`	`2422`	`audioInterface->SoundJoin();`
`2423`	`2423`	`}`
`2424`	`2424`
`2425`		`-bool CVehicleSA::SetSpecialFeatureEnabled(const VehicleFeatures::Enum& feature, bool enabled)`
	`2425`	`+bool CVehicleSA::SetSpecialFeatureEnabled(VehicleFeatures::Enum feature, bool enabled)`
`2426`	`2426`	`{`
`2427`	`2427`	`CVehicleSAInterface* vehicleInterface = GetVehicleInterface();`
`2428`	`2428`
`@@ -2443,21 +2443,23 @@ bool CVehicleSA::SetSpecialFeatureEnabled(const VehicleFeatures::Enum& feature,`
`2443`	`2443`	`return true;`
`2444`	`2444`	`}`
`2445`	`2445`
`2446`		`-bool CVehicleSA::SetModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature, bool enabled)`
	`2446`	`+bool CVehicleSA::SetModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature, bool enabled)`
`2447`	`2447`	`{`
`2448`	`2448`	`CModelInfo* modelInfo = pGame->GetModelInfo(model);`
`2449`	`2449`	`if (!modelInfo)`
`2450`	`2450`	`return false;`
`2451`	`2451`
`2452`	`2452`	`if (feature == VehicleFeatures::Enum::WATER_CANNON)`
	`2453`	`+ {`
`2453`	`2454`	`if (static_cast<VehicleClass>(modelInfo->GetVehicleType()) != VehicleClass::AUTOMOBILE)`
`2454`	`2455`	`return false;`
	`2456`	`+ }`
`2455`	`2457`
`2456`	`2458`	`m_modelSpecialFeatures[model][feature] = enabled;`
`2457`	`2459`	`return true;`
`2458`	`2460`	`}`
`2459`	`2461`
`2460`		`-bool CVehicleSA::IsModelSpecialFeatureEnabled(std::uint16_t model, const VehicleFeatures::Enum& feature)`
	`2462`	`+bool CVehicleSA::IsModelSpecialFeatureEnabled(std::uint16_t model, VehicleFeatures::Enum feature)`
`2461`	`2463`	`{`
`2462`	`2464`	`auto it = m_modelSpecialFeatures.find(model);`
`2463`	`2465`	`return it == m_modelSpecialFeatures.end() ? false : it->second[feature];`