New function: hasPlayerSpawned

Client/mods/deathmatch/ClientCommands.cpp

@@ -501,7 +501,7 @@ void DumpPlayer(CClientPlayer* pPlayer, FILE* pFile)
     fprintf(pFile, "Armor: %f\n", pPlayer->GetArmor());
     fprintf(pFile, "On screen: %u\n", pPlayer->IsOnScreen());
     fprintf(pFile, "Frozen: %u\n", pPlayer->IsFrozen());
-    fprintf(pFile, "Respawn state: %i\n", pPlayer->GetRespawnState());
+    fprintf(pFile, "Respawn state: %u\n", pPlayer->IsSpawned());
 
     fprintf(pFile, "Cur weapon slot: %i\n", static_cast<int>(pPlayer->GetCurrentWeaponSlot()));
     fprintf(pFile, "Cur weapon type: %i\n", static_cast<int>(pPlayer->GetCurrentWeaponType()));

Client/mods/deathmatch/logic/CClientPed.h

@@ -287,8 +287,8 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     void StealthKill(CClientPed* pPed);
     void BeHit(CClientPed* pClientPedAttacker, ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId);
 
-    int  GetRespawnState() const noexcept { return m_pRespawnState; };
-    void SetRespawnState(int iRespawnState) noexcept { m_pRespawnState = iRespawnState; };
+    int  IsSpawned() const noexcept { return m_bIsSpawned; }
+    void SetSpawned(const bool bSpawned) noexcept { m_bIsSpawned = bSpawned; }
 
     CWeapon*    GiveWeapon(eWeaponType weaponType, unsigned int uiAmmo, bool bSetAsCurrent = false);
     bool        SetCurrentWeaponSlot(eWeaponSlot weaponSlot);
@@ -609,7 +609,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     CTaskManager*               m_pTaskManager;
     CPad*                       m_pPad;
     bool                        m_bIsLocalPlayer;
-    int                         m_pRespawnState;
+    bool                        m_bIsSpawned;
     unsigned long               m_ulModel;
     CMatrix                     m_matFrozen;
     bool                        m_bRadioOn;

Client/mods/deathmatch/logic/CClientPlayer.cpp

@@ -216,7 +216,6 @@ void CClientPlayer::Spawn(const CVector& vecPosition, float fRotation, unsigned
     {
         SetFrozenWaitingForGroundToLoad(true);
         m_iLoadAllModelsCounter = 10;
-        SetPlayerSpawned(true);
     }
 
     // Remove any animation
@@ -246,6 +245,7 @@ void CClientPlayer::Spawn(const CVector& vecPosition, float fRotation, unsigned
     }
 
     // Set some states
+    SetSpawned(true);
     SetFrozen(false);
     Teleport(vecPosition);
     SetCurrentRotationNew(fRotation);

Client/mods/deathmatch/logic/CClientPlayer.h

@@ -72,9 +72,6 @@ class CClientPlayer final : public CClientPed
     // remove jetpack, etc...
     void Spawn(const CVector& vecPosition, float fRotation, unsigned short usModel, unsigned char ucInterior);
 
-    bool IsPlayerSpawned() const noexcept { return m_bHasPlayerSpawned; }
-    void SetPlayerSpawned(const bool bSetSpawned) noexcept { m_bHasPlayerSpawned = bSetSpawned; }
-
     unsigned long  GetLastPuresyncTime() { return m_ulLastPuresyncTime; }
     void           SetLastPuresyncTime(unsigned long ulLastPuresyncTime) { m_ulLastPuresyncTime = ulLastPuresyncTime; }
     const CVector& GetLastPuresyncPosition() { return m_vecLastPuresyncPosition; }
@@ -124,8 +121,6 @@ class CClientPlayer final : public CClientPed
     uchar   m_ucPrevBulletSyncOrderCounter;
 
 private:
-    bool m_bHasPlayerSpawned{false};
-
     bool    m_bIsLocalPlayer;
     SString m_strNick;
 

Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp

@@ -313,7 +313,7 @@ int CLuaPlayerDefs::GetPlayerWantedLevel(lua_State* luaVM)
 
 bool CLuaPlayerDefs::HasPlayerSpawned(CClientPlayer* player)
 {
-    return player->IsPlayerSpawned();
+    return player->IsSpawned();
 }
 
 

Server/mods/deathmatch/logic/CGame.cpp

@@ -2060,7 +2060,6 @@ void CGame::Packet_PlayerWasted(CPlayerWastedPacket& Packet)
     CPlayer* pPlayer = Packet.GetSourcePlayer();
     if (pPlayer && !pPlayer->IsDead())
     {
-        pPlayer->SetSpawned(false);
         pPlayer->SetIsDead(true);
         pPlayer->SetHealth(0.0f);
         pPlayer->SetArmor(0.0f);
@@ -2995,8 +2994,8 @@ void CGame::Packet_Vehicle_InOut(CVehicleInOutPacket& Packet)
                                 FAIL_TRAILER,
                             } failReason = FAIL_INVALID;
 
-                            // Is he spawned? (Fix for #2335)
-                            if (!pPed->IsSpawned())
+                            // Is he dead? (Fix for #2335)
+                            if (pPed->IsDead())
                             {
                                 CVehicleInOutPacket Reply(PedID, VehicleID, 0, VEHICLE_ATTEMPT_FAILED);
                                 pPlayer->Send(Reply);
@@ -3735,8 +3734,8 @@ void CGame::Packet_VehicleTrailer(CVehicleTrailerPacket& Packet)
     CPlayer* pPlayer = Packet.GetSourcePlayer();
     if (pPlayer && pPlayer->IsJoined())
     {
-        // Spawned?
-        if (pPlayer->IsSpawned())
+        // Alive?
+        if (!pPlayer->IsDead())
         {
             // Grab the vehicle with the chosen ID
             ElementID ID = Packet.GetVehicle();
@@ -4296,9 +4295,6 @@ void CGame::PlayerCompleteConnect(CPlayer* pPlayer)
 
     // Send him the join details
     pPlayer->Send(CPlayerConnectCompletePacket());
-
-    // The player is spawned when he's connected, just the Camera is not faded in/not targetting
-    pPlayer->SetSpawned(true);
 }
 
 void CGame::Lock()

Server/mods/deathmatch/logic/CMapManager.cpp

@@ -592,7 +592,6 @@ void CMapManager::SpawnPlayer(CPlayer& Player, const CVector& vecPosition, float
     }
 
     // Update the player data
-    Player.SetPlayerSpawned(true);
     Player.SetSpawned(true);
     Player.SetHealth(Player.GetMaxHealth());
     Player.SetIsDead(false);

Server/mods/deathmatch/logic/CPickup.h

@@ -131,8 +131,8 @@ class CPickup final : public CElement, private CColCallback
     bool CanUse(class CPlayer& Player, bool bOnfootCheck = true);
     void Use(class CPlayer& Player);
 
-    bool IsSpawned() { return m_bSpawned; }
-    void SetSpawned(bool bSpawned) { m_bSpawned = bSpawned; }
+    bool IsSpawned() const noexcept { return m_bSpawned; }
+    void SetSpawned(bool bSpawned) noexcept { m_bSpawned = bSpawned; }
 
     CColShape* GetColShape() { return m_pCollision; }
     void       SetEnabled(bool bEnabled)

Server/mods/deathmatch/logic/CPlayer.h

@@ -104,9 +104,6 @@ class CPlayer final : public CPed, public CClient
     bool IsJoined() { return m_bIsJoined; }
     void SetJoined() { m_bIsJoined = true; }
 
-    bool IsPlayerSpawned() const noexcept { return m_bHasPlayerSpawned; }
-    void SetPlayerSpawned(const bool bSetSpawned) noexcept { m_bHasPlayerSpawned = bSetSpawned; }
-
     bool SubscribeElementData(CElement* pElement, const std::string& strName);
     bool UnsubscribeElementData(CElement* pElement, const std::string& strName);
     bool UnsubscribeElementData(CElement* pElement);
@@ -468,6 +465,4 @@ class CPlayer final : public CPed, public CClient
 
     ushort  m_usPrevDimension;
     SString m_strQuitReasonForLog;
-
-    bool m_bHasPlayerSpawned;
 };

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -2136,8 +2136,8 @@ CPed* CStaticFunctionDefinitions::CreatePed(CResource* pResource, unsigned short
             }
 
             pPed->SetPosition(vecPosition);
-            pPed->SetIsDead(false);
             pPed->SetSpawned(true);
+            pPed->SetIsDead(false);
             pPed->SetHealth(100.0f);
             pPed->SetSyncable(bSynced);
 
@@ -3722,7 +3722,6 @@ bool CStaticFunctionDefinitions::KillPed(CElement* pElement, CElement* pKiller,
             }
 
             // Update the ped
-            pPed->SetSpawned(false);
             pPed->SetIsDead(true);
             pPed->SetHealth(0.0f);
             pPed->SetArmor(0.0f);

Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp

@@ -1462,7 +1462,7 @@ unsigned int CLuaPlayerDefs::GetPlayerScriptDebugLevel(CPlayer* const player)
 
 bool CLuaPlayerDefs::HasPlayerSpawned(CPlayer* player)
 {
-    return player->IsPlayerSpawned();
+    return player->IsSpawned();
 }
 
 int CLuaPlayerDefs::BindKey(lua_State* luaVM)