Move Is/SetVehicleEngineManualModeEnabled back to MultiplayerSA

Author: samr46

Client/game_sa/CGameSA.cpp

@@ -930,25 +930,6 @@ void CGameSA::SetVehicleBurnExplosionsEnabled(bool isEnabled)
     m_isVehicleBurnExplosionsEnabled = isEnabled;
 }
 
-void CGameSA::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);
-    }
-}
-
-bool CGameSA::IsVehicleEngineManualModeEnabled() const noexcept
-{
-    return *(unsigned char*)0x64BC03 == 0x90;
-}
-
 bool CGameSA::PerformChecks()
 {
     std::map<std::string, SCheatSA*>::iterator it;

Client/game_sa/CGameSA.h

@@ -262,9 +262,6 @@ class CGameSA : public CGame
     bool IsVehicleBurnExplosionsEnabled() const noexcept override { return m_isVehicleBurnExplosionsEnabled; }
     void SetVehicleBurnExplosionsEnabled(bool isEnabled) override;
 
-    void SetVehicleEngineManualModeEnabled(bool enabled) override;
-    bool IsVehicleEngineManualModeEnabled() const noexcept override;
-
     unsigned long GetMinuteDuration();
     void          SetMinuteDuration(unsigned long ulTime);
 

Client/game_sa/CVehicleSA.cpp

@@ -10,6 +10,8 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include <core/CCoreInterface.h>
+#include <multiplayer/CMultiplayer.h>
 #include "CAutomobileSA.h"
 #include "CBikeSA.h"
 #include "CCameraSA.h"
@@ -28,7 +30,8 @@
 #include "gamesa_renderware.h"
 #include "CFireManagerSA.h"
 
-extern CGameSA* pGame;
+extern CCoreInterface* g_pCore;
+extern CGameSA*        pGame;
 
 static BOOL m_bVehicleSunGlare = false;
 _declspec(naked) void DoVehicleSunGlare(void* this_)
@@ -63,7 +66,7 @@ static bool __fastcall CanProcessFlyingCarStuff(CAutomobileSAInterface* vehicleI
 
     if (vehicle->pEntity->GetVehicleRotorState())
     {
-        if (!pGame->IsVehicleEngineManualModeEnabled()) // keep default behavior
+        if (!g_pCore->GetMultiplayer()->IsVehicleEngineManualModeEnabled()) // keep default behavior
             return true;
 
         if (vehicle->pEntity->GetEntityStatus() != eEntityStatus::STATUS_PHYSICS && !vehicle->pEntity->IsBeingDriven())

Client/mods/deathmatch/logic/CClientGame.cpp

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

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -6634,6 +6634,25 @@ void CMultiplayerSA::SetAutomaticVehicleStartupOnPedEnter(bool bSet)
         MemSet((char*)0x64BC0D, 0x90, 6);
 }
 
+bool CMultiplayerSA::IsVehicleEngineManualModeEnabled() const noexcept
+{
+    return *(unsigned char*)0x64BC03 == 0x90;
+}
+
+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,9 @@ class CMultiplayerSA : public CMultiplayer
 
     void SetAutomaticVehicleStartupOnPedEnter(bool bSet);
 
+    bool IsVehicleEngineManualModeEnabled() const noexcept override;
+    void SetVehicleEngineManualModeEnabled(bool enabled) override;
+
     void SetPedTargetingMarkerEnabled(bool bEnable);
     bool IsPedTargetingMarkerEnabled();
     bool IsConnected();

Client/sdk/game/CGame.h

@@ -241,9 +241,6 @@ class __declspec(novtable) CGame
     virtual bool IsVehicleBurnExplosionsEnabled() const noexcept = 0;
     virtual void SetVehicleBurnExplosionsEnabled(bool isEnabled) = 0;
 
-    virtual void SetVehicleEngineManualModeEnabled(bool enabled) = 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,9 @@ class CMultiplayer
 
     virtual void SetAutomaticVehicleStartupOnPedEnter(bool bSet) = 0;
 
+    virtual bool IsVehicleEngineManualModeEnabled() const noexcept = 0;
+    virtual void SetVehicleEngineManualModeEnabled(bool enabled) = 0;
+
     virtual void SetPedTargetingMarkerEnabled(bool bEnabled) = 0;
     virtual bool IsPedTargetingMarkerEnabled() = 0;