Little refactor

multitheftauto · Feb 4, 2025 · ed00c97 · ed00c97
1 parent 7fb152c
commit ed00c97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Client/game_sa/CVehicleSA.cpp b/Client/game_sa/CVehicleSA.cpp
@@ -910,12 +910,6 @@ void CVehicleSA::SetEngineOn(bool bEngineOn)
     }
 }
 
-bool CVehicleSA::IsPassenger(CPed* pPed)
-{
-    using FUNC_CVehicle_IsPassenger_t = bool(__thiscall*)(CVehicleSAInterface* self, CPedSAInterface* ped);
-    return ((FUNC_CVehicle_IsPassenger_t)(FUNC_CVehicle_IsPassenger))(GetVehicleInterface(), pPed->GetPedInterface());
-}
-
 CPed* CVehicleSA::GetDriver()
 {
     CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();

diff --git a/Client/game_sa/CVehicleSA.h b/Client/game_sa/CVehicleSA.h
@@ -281,6 +281,10 @@ class CVehicleSAInterface : public CPhysicalSAInterface
         ((void(__thiscall*)(CVehicleSAInterface*, RwFrame*, std::uint32_t))0x6D2700)(this, component, state);
     }
 
+    bool IsPassenger(CPedSAInterface* ped) const noexcept {
+        return ((bool(__thiscall*)(CVehicleSAInterface const*, CPedSAInterface*))0x6D1BD0)(this, ped);
+    }
+
     CAEVehicleAudioEntitySAInterface m_VehicleAudioEntity;            // 312
 
     tHandlingDataSA*       pHandlingData;                  // +900
@@ -476,7 +480,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
     void  SetRailTrack(BYTE ucTrackID);
     float GetTrainPosition();
     void  SetTrainPosition(float fPosition, bool bRecalcOnRailDistance = true);
-    bool  IsPassenger(CPed* pPed);
+    bool  IsPassenger(CPed* pPed) noexcept { return GetVehicleInterface()->IsPassenger(pPed->GetPedInterface()); };
 
     void AddVehicleUpgrade(DWORD dwModelID);
     void RemoveVehicleUpgrade(DWORD dwModelID);