Reversed IsEngineOn, GetSiren and GetBeaconLightsOn (#90)

* Added missing getters / setters * Dump pointers first * Added C_Human2CarWrapper::IsEngineOn * reversed vehicle flags, fixed beacon lights getter * Update c_vehicle.h * IsEngineOn * Update c_car.h
MafiaHub · Feb 5, 2024 · 550a4a3 · 550a4a3
1 parent ca5b5de
commit 550a4a3
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 10 deletions.
diff --git a/code/client/src/core/modules/vehicle.cpp b/code/client/src/core/modules/vehicle.cpp
@@ -71,7 +71,7 @@ namespace MafiaMP::Core::Modules {
                     metadata.radioStationId  = vehicle->GetRadioStation();
                     metadata.rimColor        = {rimColor.r, rimColor.g, rimColor.b, rimColor.a};
                     metadata.rust            = vehicle->GetVehicleRust();
-                    metadata.sirenOn         = vehicle->GetSiren();
+                    metadata.sirenOn         = vehicle->IsSiren();
                     metadata.steer           = vehicle->GetSteer();
                     metadata.tireColor       = {tireColor.r, tireColor.g, tireColor.b, tireColor.a};
                     metadata.velocity        = {vehicleVelocity.x, vehicleVelocity.y, vehicleVelocity.z};

diff --git a/code/client/src/core/ui/vehicle_debug.cpp b/code/client/src/core/ui/vehicle_debug.cpp
@@ -20,6 +20,8 @@ namespace MafiaMP::Core::UI {
 
         if (currentCar) {
             auto currentVehicle = currentCar->GetVehicle();
+            ImGui::Text("Car Ptr: %p", currentCar);
+            ImGui::Text("Vehicle Ptr: %p", currentVehicle);
 
             auto position = currentCar->GetPos();
             if (ImGui::DragFloat3("Pos", (float *)&position, 0.1f, -4500.0f, 4500.0f)) {
@@ -90,7 +92,7 @@ namespace MafiaMP::Core::UI {
                 currentVehicle->SetHorn(horn);
             }
 
-            bool siren = currentVehicle->GetSiren();
+            bool siren = currentVehicle->IsSiren();
             if (ImGui::Checkbox("Siren", &siren)) {
                 currentVehicle->SetSiren(siren);
             }
@@ -100,6 +102,11 @@ namespace MafiaMP::Core::UI {
                 currentVehicle->SetBeaconLightsOn(beaconsLight);
             }
 
+            bool isEngineOn = currentCar->IsEngineOn();
+            if (ImGui::Checkbox("Engine", &isEngineOn)) {
+                currentVehicle->SetEngineOn(isEngineOn, isEngineOn);
+            }
+
             SDK::ue::sys::math::C_Vector4 color1, color2;
             currentVehicle->GetVehicleColor(&color1, &color2);
 

diff --git a/code/client/src/sdk/entities/c_car.h b/code/client/src/sdk/entities/c_car.h
@@ -52,7 +52,14 @@ namespace SDK {
         void ExplodeCar(float, bool);
 
         C_Vehicle *GetVehicle() {
+            // TODO: move to class fields
             return reinterpret_cast<C_Vehicle *>((uintptr_t)this + 0xF8);
         }
+
+        bool IsEngineOn() const {
+            // TODO: move to class fields
+            uint64_t flags = *reinterpret_cast<uint64_t *>((uintptr_t)this + 0x1280);
+            return (flags >> 2) & 1;
+        }
     };
 } // namespace SDK
diff --git a/code/client/src/sdk/entities/c_vehicle.cpp b/code/client/src/sdk/entities/c_vehicle.cpp
@@ -43,6 +43,10 @@ namespace SDK {
         hook::this_call(gPatterns.C_Vehicle__SetSiren, this, on);
     }
 
+    bool C_Vehicle::IsSiren() {
+        return hook::this_call<bool>(gPatterns.C_Vehicle__IsSiren, this);
+    }
+
     void C_Vehicle::SetSteer(float steer) {
         hook::this_call(gPatterns.C_Vehicle__SetSteer, this, steer);
     }
@@ -146,6 +150,10 @@ namespace SDK {
         return (m_pRadioSound && m_pRadioSound->IsRadioOn());
     }
 
+    bool C_Vehicle::IsAnyLightOn() {
+        return hook::this_call<bool>(gPatterns.C_Vehicle__IsAnyLightOn, this);
+    }
+
     void C_Vehicle::EnableRadio(bool enable) {
         // NB: Need to shift to (I assume to a radio) interface
         void *shiftedThis = reinterpret_cast<void *>(reinterpret_cast<uint64_t>(this) + 0x268);

diff --git a/code/client/src/sdk/entities/c_vehicle.h b/code/client/src/sdk/entities/c_vehicle.h
@@ -9,6 +9,10 @@
 #include <cstdint>
 
 namespace SDK {
+    enum E_VehicleFlags {
+        BEACON_LIGHTS = 0x40,
+    };
+
     class C_Vehicle {
       public:
         void AddVehicleFlags(uint64_t);
@@ -30,19 +34,14 @@ namespace SDK {
         }
 
         void SetEngineOn(bool on, bool arg2);
-        bool IsEngineOn() const {
-            return false; // TODO: implement me
-        }
 
         void SetPower(float power);
         float GetPower() const {
             return m_fPower;
         }
 
         void SetSiren(bool on);
-        bool GetSiren() const {
-            return false; // TODO: implement me
-        }
+        bool IsSiren();
 
         void SetSteer(float steer);
         float GetSteer() const {
@@ -96,7 +95,7 @@ namespace SDK {
 
         void SetBeaconLightsOn(bool on);
         bool GetBeaconLightsOn() {
-            return false; // TODO: implement me
+            return (m_uFlags & E_VehicleFlags::BEACON_LIGHTS) != 0;
         }
         void SetSearchLightsOn(bool on);
 
@@ -107,6 +106,8 @@ namespace SDK {
 
         void Damage(bool arg1);
 
+        bool IsAnyLightOn();
+
         bool IsRadioOn();
         void EnableRadio(bool enable);
         void TurnRadioOn(bool on);
@@ -145,7 +146,9 @@ namespace SDK {
         char pad7[0x8];                                                    // 0C58 - 0C60
         float m_fDirty;                                                    // 0C60 - 0C64
         float m_fRust;                                                     // 0C64 - 0C68
-        char pad8[0x890];                                                  // 0C68 - 14F8
+        char pad8[0x98];                                                   // 0C68 - 0D00
+        uint64_t m_uFlags;                                                 // 0D00 - 0D08
+        char pad9[0x7F0];                                                  // 0D08 - 14F8
         ue::game::audio::radio::C_RadioSound *m_pRadioSound;               // 14F8 - 1500
     };
 } // namespace SDK
diff --git a/code/client/src/sdk/patterns.cpp b/code/client/src/sdk/patterns.cpp
@@ -176,6 +176,7 @@ namespace SDK {
 
         // C_Human2CarWrapper
         gPatterns.C_Human2CarWrapper__GetSeatID = hook::get_opcode_address("E8 ? ? ? ? 3D ? ? ? ? 75 0E");
+        gPatterns.C_Human2CarWrapper__IsEngineOn = hook::get_opcode_address("E8 ? ? ? ? 84 C0 75 16 44 8B 87 ? ? ? ?");
 
         // C_HumanInventory
         gPatterns.C_HumanInventory__AddItem                       = hook::get_opcode_address("E8 ? ? ? ? E9 ? ? ? ? 41 8B D6");
@@ -371,6 +372,7 @@ namespace SDK {
         gPatterns.C_Vehicle__EnableRadio       = hook::get_opcode_address("E8 ? ? ? ? 49 8B 84 24 ? ? ? ? 49 8B F7");
         gPatterns.C_Vehicle__GetSPZText        = hook::get_opcode_address("E8 ? ? ? ? 49 8D 4F ? 48 8B D0");
         gPatterns.C_Vehicle__IsActive          = hook::get_opcode_address("E8 ? ? ? ? 84 C0 75 0A B2 01");
+        gPatterns.C_Vehicle__IsAnyLightOn      = reinterpret_cast<uint64_t>(hook::get_pattern("48 8B 81 ? ? ? ? 48 8B 89 ? ? ? ? 48 3B C1 74 18 48 8B 10"));
         gPatterns.C_Vehicle__IsSiren           = hook::get_opcode_address("E8 ? ? ? ? 0F B6 4D BF");
         gPatterns.C_Vehicle__SetActive         = hook::get_opcode_address("E8 ? ? ? ? F3 0F 59 35 ? ? ? ? 48 8D 8B ? ? ? ?");
         gPatterns.C_Vehicle__SetAngularSpeed   = hook::get_opcode_address("E8 ? ? ? ? E9 ? ? ? ? 80 BD ? ? ? ? ? 0F 85 ? ? ? ?");

diff --git a/code/client/src/sdk/patterns.h b/code/client/src/sdk/patterns.h
@@ -155,6 +155,7 @@ namespace SDK {
 
         // C_Human2CarWrapper
         uint64_t C_Human2CarWrapper__GetSeatID = 0x0;
+        uint64_t C_Human2CarWrapper__IsEngineOn = 0x0;
 
         // C_HumanInventory
         uint64_t C_HumanInventory__AddItem                       = 0x0;
@@ -326,6 +327,7 @@ namespace SDK {
         uint64_t C_Vehicle__EnableRadio        = 0x0;
         uint64_t C_Vehicle__GetSPZText         = 0x0;
         uint64_t C_Vehicle__IsActive           = 0x0;
+        uint64_t C_Vehicle__IsAnyLightOn       = 0x0;
         uint64_t C_Vehicle__IsSiren            = 0x0;
         uint64_t C_Vehicle__SetActive          = 0x0;
         uint64_t C_Vehicle__SetAngularSpeed    = 0x0;

diff --git a/code/client/src/sdk/wrappers/c_human_2_car_wrapper.cpp b/code/client/src/sdk/wrappers/c_human_2_car_wrapper.cpp
@@ -7,6 +7,10 @@ namespace SDK {
         return GetSeatID(pActor) == 0;
     }
 
+    bool C_Human2CarWrapper::IsEngineOn() {
+        return hook::this_call<bool>(gPatterns.C_Human2CarWrapper__IsEngineOn, this);
+    }
+
     unsigned int C_Human2CarWrapper::GetSeatID(C_Actor *pActor) {
         return hook::this_call<unsigned int>(gPatterns.C_Human2CarWrapper__GetSeatID, this, pActor);
     }

diff --git a/code/client/src/sdk/wrappers/c_human_2_car_wrapper.h b/code/client/src/sdk/wrappers/c_human_2_car_wrapper.h
@@ -10,6 +10,7 @@ namespace SDK {
         C_Car *m_pUsedCar;                  // 0018 - 0020
       public:
         bool IsDriver(C_Actor *);
+        bool IsEngineOn();
         unsigned int GetSeatID(C_Actor *);
     };
 }