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.cpp

@@ -720,60 +720,6 @@ void CClientPed::SetCurrentRotationNew(float fRotation)
     SetRotationRadiansNew(CVector(0, 0, fRotation));
 }
 
-void CClientPed::Spawn(const CVector& vecPosition, float fRotation, unsigned short usModel, unsigned char ucInterior)
-{
-    // Remove us from our car
-    RemoveFromVehicle();
-    SetVehicleInOutState(VEHICLE_INOUT_NONE);
-
-    // Wait for ground
-    if (m_bIsLocalPlayer)
-    {
-        SetFrozenWaitingForGroundToLoad(true);
-        m_iLoadAllModelsCounter = 10;
-    }
-
-    // Remove any animation
-    KillAnimation();
-
-    // Give him the correct model
-    SetModel(usModel);
-
-    // Detach from any entities
-    AttachTo(NULL);
-
-    // Restore our health before any resurrection calls (::SetHealth/SetInitialState)
-    // So we don't get recreated more than once
-    if (m_pPlayerPed)
-    {
-        m_pPlayerPed->SetInitialState();
-        m_fHealth = GetMaxHealth();
-        m_pPlayerPed->SetHealth(m_fHealth);
-        m_bUsesCollision = true;
-        m_pPlayerPed->SetLanding(false);
-    }
-    else
-    {
-        // Remote ped health/armor was locked during Kill, so make sure it's unlocked
-        UnlockHealth();
-        UnlockArmor();
-    }
-
-    // Set some states
-    SetFrozen(false);
-    Teleport(vecPosition);
-    SetCurrentRotationNew(fRotation);
-    SetHealth(GetMaxHealth());
-    RemoveAllWeapons();
-    SetArmor(0);
-    ResetInterpolation();
-    SetHasJetPack(false);
-    SetMoveSpeed(CVector());
-    SetInterior(ucInterior);
-    SetFootBloodEnabled(false);
-    SetIsDead(false);
-}
-
 void CClientPed::ResetInterpolation()
 {
     m_ulBeginRotationTime = 0;

Client/mods/deathmatch/logic/CClientPed.h

@@ -200,11 +200,6 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
 
     void Teleport(const CVector& vecPosition);
 
-    // This function spawns/respawns this ped in any location. This will force a recreation
-    // and restoration of initial state. This will also remove all weapons, unfreeze,
-    // remove jetpack, etc...
-    void Spawn(const CVector& vecPosition, float fRotation, unsigned short usModel, unsigned char ucInterior);
-
     void ResetInterpolation();
 
     float GetCurrentRotation();
@@ -292,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);
@@ -614,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

@@ -205,6 +205,61 @@ bool CClientPlayer::IsOnMyTeam(CClientPlayer* pPlayer)
     return false;
 }
 
+void CClientPlayer::Spawn(const CVector& vecPosition, float fRotation, unsigned short usModel, unsigned char ucInterior)
+{
+    // Remove us from our car
+    RemoveFromVehicle();
+    SetVehicleInOutState(VEHICLE_INOUT_NONE);
+
+    // Wait for ground
+    if (m_bIsLocalPlayer)
+    {
+        SetFrozenWaitingForGroundToLoad(true);
+        m_iLoadAllModelsCounter = 10;
+    }
+
+    // Remove any animation
+    KillAnimation();
+
+    // Give him the correct model
+    SetModel(usModel);
+
+    // Detach from any entities
+    AttachTo(NULL);
+
+    // Restore our health before any resurrection calls (::SetHealth/SetInitialState)
+    // So we don't get recreated more than once
+    if (m_pPlayerPed)
+    {
+        m_pPlayerPed->SetInitialState();
+        m_fHealth = GetMaxHealth();
+        m_pPlayerPed->SetHealth(m_fHealth);
+        m_bUsesCollision = true;
+        m_pPlayerPed->SetLanding(false);
+    }
+    else
+    {
+        // Remote ped health/armor was locked during Kill, so make sure it's unlocked
+        UnlockHealth();
+        UnlockArmor();
+    }
+
+    // Set some states
+    SetSpawned(true);
+    SetFrozen(false);
+    Teleport(vecPosition);
+    SetCurrentRotationNew(fRotation);
+    SetHealth(GetMaxHealth());
+    RemoveAllWeapons();
+    SetArmor(0);
+    ResetInterpolation();
+    SetHasJetPack(false);
+    SetMoveSpeed(CVector());
+    SetInterior(ucInterior);
+    SetFootBloodEnabled(false);
+    SetIsDead(false);
+}
+
 void CClientPlayer::Reset()
 {
     // stats

Client/mods/deathmatch/logic/CClientPlayer.h

@@ -66,6 +66,11 @@ class CClientPlayer final : public CClientPed
 
     unsigned short GetLatency() { return m_usLatency; }
     void           SetLatency(unsigned short usLatency) { m_usLatency = (m_usLatency + usLatency) / 2; }
+
+    // This function spawns/respawns this ped in any location. This will force a recreation
+    // and restoration of initial state. This will also remove all weapons, unfreeze,
+    // remove jetpack, etc...
+    void Spawn(const CVector& vecPosition, float fRotation, unsigned short usModel, unsigned char ucInterior);
 
     unsigned long  GetLastPuresyncTime() { return m_ulLastPuresyncTime; }
     void           SetLastPuresyncTime(unsigned long ulLastPuresyncTime) { m_ulLastPuresyncTime = ulLastPuresyncTime; }

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

@@ -28,6 +28,7 @@ void CLuaPlayerDefs::LoadFunctions()
         {"isPlayerHudComponentVisible", IsPlayerHudComponentVisible},
         {"getPlayerMoney", GetPlayerMoney},
         {"getPlayerWantedLevel", GetPlayerWantedLevel},
+        {"hasPlayerSpawned", ArgumentParser<HasPlayerSpawned>},
 
         // Player set funcs
         {"showPlayerHudComponent", ShowPlayerHudComponent},
@@ -309,6 +310,13 @@ int CLuaPlayerDefs::GetPlayerWantedLevel(lua_State* luaVM)
     return 1;
 }
 
+
+bool CLuaPlayerDefs::HasPlayerSpawned(CClientPlayer* player)
+{
+    return player->IsSpawned();
+}
+
+
 int CLuaPlayerDefs::ShowPlayerHudComponent(lua_State* luaVM)
 {
     //  bool showPlayerHudComponent ( string component, bool show )

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

@@ -29,6 +29,7 @@ class CLuaPlayerDefs : public CLuaDefs
     LUA_DECLARE(GetPlayerTeam);
     LUA_DECLARE(GetPlayerMoney);
     LUA_DECLARE(GetPlayerWantedLevel);
+    static bool HasPlayerSpawned(CClientPlayer* player);
 
     // Player set
     LUA_DECLARE(ShowPlayerHudComponent);

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/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/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

@@ -49,6 +49,7 @@ void CLuaPlayerDefs::LoadFunctions()
         {"resendPlayerModInfo", ResendPlayerModInfo},
         {"resendPlayerACInfo", ResendPlayerACInfo},
         {"getPlayerScriptDebugLevel", ArgumentParser<GetPlayerScriptDebugLevel>},
+        {"hasPlayerSpawned", ArgumentParser<HasPlayerSpawned>},
 
         // Player set funcs
         {"setPlayerMoney", SetPlayerMoney},
@@ -1459,6 +1460,11 @@ unsigned int CLuaPlayerDefs::GetPlayerScriptDebugLevel(CPlayer* const player)
     return player->GetScriptDebugLevel();
 }
 
+bool CLuaPlayerDefs::HasPlayerSpawned(CPlayer* player)
+{
+    return player->IsSpawned();
+}
+
 int CLuaPlayerDefs::BindKey(lua_State* luaVM)
 {
     CPlayer* pPlayer;

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

@@ -47,6 +47,7 @@ class CLuaPlayerDefs : public CLuaDefs
     LUA_DECLARE(GetPlayerVersion);
     LUA_DECLARE(GetPlayerACInfo);
     static unsigned int GetPlayerScriptDebugLevel(CPlayer* const player);
+    static bool HasPlayerSpawned(CPlayer* player);
 
     // Player set functions
     LUA_DECLARE(SetPlayerMoney);