Move SetVehicleEngineManualModeEnabled() to appropriate module

Author: samr46

Client/game_sa/CGameSA.cpp

@@ -930,20 +930,6 @@ void CGameSA::SetVehicleBurnExplosionsEnabled(bool isEnabled)
     m_isVehicleBurnExplosionsEnabled = isEnabled;
 }
 
-void CGameSA::SetVehicleEngineManualModeEnabled(bool isEnabled)
-{
-    if (isEnabled)
-    {
-        MemSet((void*)0x64BC03, 0x90, 5);                          // prevent vehicle engine from turning on (driver enter)
-        MemCpy((void*)0x6C4EA9, "\xE9\x15\x03\x00", 4);            // prevent aircraft engine from turning off (driver exit)
-    }
-    else
-    {
-        MemCpy((void*)0x64BC03, "\x75\x05\x80\xC9\x10", 5);
-        MemCpy((void*)0x6C4EA9, "\x8A\x86\x28\x04", 4);
-    }
-}
-
 bool CGameSA::PerformChecks()
 {
     std::map<std::string, SCheatSA*>::iterator it;

Client/game_sa/CGameSA.h

@@ -262,7 +262,7 @@ class CGameSA : public CGame
     bool IsVehicleBurnExplosionsEnabled() const noexcept override { return m_isVehicleBurnExplosionsEnabled; }
     void SetVehicleBurnExplosionsEnabled(bool isEnabled) override;
 
-    void SetVehicleEngineManualModeEnabled(bool isEnabled) override;
+    bool IsVehicleEngineManualModeEnabled() const noexcept override { return *(unsigned char*)0x64BC03 == 0x90; }
 
     unsigned long GetMinuteDuration();
     void          SetMinuteDuration(unsigned long ulTime);

Client/game_sa/CVehicleSA.cpp

@@ -63,7 +63,7 @@ static bool __fastcall CanProcessFlyingCarStuff(CAutomobileSAInterface* vehicleI
 
     if (vehicle->pEntity->GetVehicleRotorState())
     {
-        if (*(unsigned char*)0x64BC03 == 0x75) // keep default behavior
+        if (!pGame->IsVehicleEngineManualModeEnabled()) // keep default behavior
             return true;
 
         if (vehicle->pEntity->GetEntityStatus() != eEntityStatus::STATUS_PHYSICS && !vehicle->pEntity->IsBeingDriven())

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -6143,15 +6143,18 @@ bool CClientGame::IsWeaponRenderEnabled() const
     return g_pGame->IsWeaponRenderEnabled();
 }
 
-void CClientGame::SetVehicleEngineManualModeEnabled(bool isEnabled)
+void CClientGame::SetVehicleEngineManualModeEnabled(bool enabled)
 {
-    if (isEnabled == m_isVehEngineManualModeEnabled)
+    if (enabled == g_pGame->IsVehicleEngineManualModeEnabled())
         return;
 
-    g_pGame->SetVehicleEngineManualModeEnabled(isEnabled);
-    m_pVehicleManager->ResetNotControlledRotors(isEnabled);
+    g_pMultiplayer->SetVehicleEngineManualModeEnabled(enabled);
+    m_pVehicleManager->ResetNotControlledRotors(enabled);
+}
 
-    m_isVehEngineManualModeEnabled = isEnabled;
+bool CClientGame::IsVehicleEngineManualModeEnabled() const
+{
+    return g_pGame->IsVehicleEngineManualModeEnabled();
 }
 
 #pragma code_seg(".text")

Client/mods/deathmatch/logic/CClientGame.h

@@ -426,8 +426,8 @@ class CClientGame
     void SetWeaponRenderEnabled(bool enabled);
     bool IsWeaponRenderEnabled() const;
 
-    bool IsVehicleEngineManualModeEnabled() const noexcept { return m_isVehEngineManualModeEnabled; }
-    void SetVehicleEngineManualModeEnabled(bool isEnabled);
+    void SetVehicleEngineManualModeEnabled(bool enabled);
+    bool IsVehicleEngineManualModeEnabled() const;
 
     void ResetWorldProperties(const ResetWorldPropsInfo& resetPropsInfo);
 
@@ -787,8 +787,6 @@ class CClientGame
     // Birds Enabled
     bool m_bBirdsEnabled;
 
-    bool m_isVehEngineManualModeEnabled{false};
-
     unsigned long m_ulMinuteDuration;
 
     CClientGUIElement* m_pClickedGUIElement;

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -6634,6 +6634,20 @@ void CMultiplayerSA::SetAutomaticVehicleStartupOnPedEnter(bool bSet)
         MemSet((char*)0x64BC0D, 0x90, 6);
 }
 
+void CMultiplayerSA::SetVehicleEngineManualModeEnabled(bool enabled)
+{
+    if (enabled)
+    {
+        MemSet((void*)0x64BC03, 0x90, 5);                          // prevent vehicle engine from turning on (driver enter)
+        MemCpy((void*)0x6C4EA9, "\xE9\x15\x03\x00", 4);            // prevent aircraft engine from turning off (driver exit)
+    }
+    else
+    {
+        MemCpy((void*)0x64BC03, "\x75\x05\x80\xC9\x10", 5);
+        MemCpy((void*)0x6C4EA9, "\x8A\x86\x28\x04", 4);
+    }
+}
+
 // Storage
 CVehicleSAInterface* pHeliKiller = NULL;
 CEntitySAInterface*  pHitByHeli = NULL;

Client/multiplayer_sa/CMultiplayerSA.h

@@ -333,6 +333,8 @@ class CMultiplayerSA : public CMultiplayer
 
     void SetAutomaticVehicleStartupOnPedEnter(bool bSet);
 
+    void SetVehicleEngineManualModeEnabled(bool enabled) override;
+
     void SetPedTargetingMarkerEnabled(bool bEnable);
     bool IsPedTargetingMarkerEnabled();
     bool IsConnected();

Client/sdk/game/CGame.h

@@ -241,7 +241,7 @@ class __declspec(novtable) CGame
     virtual bool IsVehicleBurnExplosionsEnabled() const noexcept = 0;
     virtual void SetVehicleBurnExplosionsEnabled(bool isEnabled) = 0;
 
-    virtual void SetVehicleEngineManualModeEnabled(bool isEnabled) = 0;
+    virtual bool IsVehicleEngineManualModeEnabled() const noexcept = 0;
 
     virtual CWeapon*     CreateWeapon() = 0;
     virtual CWeaponStat* CreateWeaponStat(eWeaponType weaponType, eWeaponSkill weaponSkill) = 0;

Client/sdk/multiplayer/CMultiplayer.h

@@ -444,6 +444,8 @@ class CMultiplayer
 
     virtual void SetAutomaticVehicleStartupOnPedEnter(bool bSet) = 0;
 
+    virtual void SetVehicleEngineManualModeEnabled(bool enabled) = 0;
+
     virtual void SetPedTargetingMarkerEnabled(bool bEnabled) = 0;
     virtual bool IsPedTargetingMarkerEnabled() = 0;