Skip to content

Commit 0a6e8ea

Browse files
committed
Use direct memory check instead of new variable
1 parent 79f53bd commit 0a6e8ea

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Client/game_sa/CGameSA.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -932,9 +932,6 @@ void CGameSA::SetVehicleBurnExplosionsEnabled(bool isEnabled)
932932

933933
void CGameSA::SetVehicleEngineManualModeEnabled(bool enabled)
934934
{
935-
if (enabled == m_isVehicleEngineManualModeEnabled)
936-
return;
937-
938935
if (enabled)
939936
{
940937
MemSet((void*)0x64BC03, 0x90, 5); // prevent vehicle engine from turning on (driver enter)
@@ -945,8 +942,11 @@ void CGameSA::SetVehicleEngineManualModeEnabled(bool enabled)
945942
MemCpy((void*)0x64BC03, "\x75\x05\x80\xC9\x10", 5);
946943
MemCpy((void*)0x6C4EA9, "\x8A\x86\x28\x04", 4);
947944
}
945+
}
948946

949-
m_isVehicleEngineManualModeEnabled = enabled;
947+
bool CGameSA::IsVehicleEngineManualModeEnabled() const noexcept
948+
{
949+
return *(unsigned char*)0x64BC03 == 0x90;
950950
}
951951

952952
bool CGameSA::PerformChecks()

Client/game_sa/CGameSA.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ class CGameSA : public CGame
262262
bool IsVehicleBurnExplosionsEnabled() const noexcept override { return m_isVehicleBurnExplosionsEnabled; }
263263
void SetVehicleBurnExplosionsEnabled(bool isEnabled) override;
264264

265-
bool IsVehicleEngineManualModeEnabled() const noexcept override { return m_isVehicleEngineManualModeEnabled; }
266265
void SetVehicleEngineManualModeEnabled(bool enabled) override;
266+
bool IsVehicleEngineManualModeEnabled() const noexcept override;
267267

268268
unsigned long GetMinuteDuration();
269269
void SetMinuteDuration(unsigned long ulTime);
@@ -397,7 +397,6 @@ class CGameSA : public CGame
397397
bool m_isExtendedWaterCannonsEnabled{false};
398398
bool m_isIgnoreFireStateEnabled{false};
399399
bool m_isVehicleBurnExplosionsEnabled{true};
400-
bool m_isVehicleEngineManualModeEnabled{false};
401400

402401
static unsigned int& ClumpOffset;
403402

0 commit comments

Comments
 (0)