Implement entering/exiting/jacking for peds (#1748)

multitheftauto · Nov 28, 2020 · 94c6aba · 94c6aba
1 parent fe1c418
commit 94c6aba
Show file tree

Hide file tree

Showing 24 changed files with 1,512 additions and 1,037 deletions.
diff --git a/Client/mods/deathmatch/ClientCommands.cpp b/Client/mods/deathmatch/ClientCommands.cpp
@@ -177,7 +177,21 @@ void COMMAND_EnterPassenger(const char* szCmdLine)
             {
                 if (pWeapon->GetState() != WEAPONSTATE_RELOADING)
                 {
-                    g_pClientGame->ProcessVehicleInOutKey(true);
+                    // If we are already in a vehicle
+                    CClientVehicle* pVehicle = pPlayer->GetOccupiedVehicle();
+                    if (pVehicle)
+                    {
+                        // Make sure we are in a passenger seat, otherwise we must use enter_exit
+                        if (pPlayer->GetOccupiedVehicleSeat() != 0)
+                        {
+                            pPlayer->ExitVehicle();
+                        }
+                    }
+                    else
+                    {
+                        // Enter nearest vehicle as passenger
+                        pPlayer->EnterVehicle(nullptr, true);
+                    }
                 }
             }
         }

diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -251,8 +251,6 @@ class CClientGame
     bool IsNickValid(const char* szNick);
     bool IsNametagValid(const char* szNick);
 
-    bool IsGettingIntoVehicle() { return m_bIsGettingIntoVehicle; };
-
     void StartPlayback();
     void EnablePacketRecorder(const char* szFilename);
     void InitVoice(bool bEnabled, unsigned int uiServerSampleRate, unsigned char ucQuality, unsigned int uiBitrate);
@@ -345,10 +343,6 @@ class CClientGame
     bool           GetDamageSent() { return m_bDamageSent; }
     void           SetDamageSent(bool b) { m_bDamageSent = b; }
 
-    void ProcessVehicleInOutKey(bool bPassenger);
-
-    void ResetVehicleInOut();
-
     void SetAllDimensions(unsigned short usDimension);
     void SetAllInteriors(unsigned char ucInterior);
 
@@ -464,7 +458,6 @@ class CClientGame
 
     // Network update functions
     void DoVehicleInKeyCheck();
-    void UpdateVehicleInOut();
     void UpdatePlayerTarget();
     void UpdatePlayerWeapons();
     void UpdateTrailers();
@@ -725,18 +718,6 @@ class CClientGame
     bool m_bTriggeredIngameAndConnected;
     bool m_bGracefulDisconnect;
 
-    // Network update vars
-    unsigned long  m_ulLastVehicleInOutTime;
-    bool           m_bIsGettingOutOfVehicle;
-    bool           m_bIsGettingIntoVehicle;
-    bool           m_bIsJackingVehicle;
-    bool           m_bIsGettingJacked;
-    ElementID      m_VehicleInOutID;
-    unsigned char  m_ucVehicleInOutSeat;
-    bool           m_bNoNewVehicleTask;
-    ElementID      m_NoNewVehicleTaskReasonID;
-    CClientPlayer* m_pGettingJackedBy;
-
     CEntity*       m_pTargetedGameEntity;
     CClientEntity* m_pTargetedEntity;
     bool           m_bTargetSent;