New function: hasPlayerSpawned

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();

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;
+        SetPlayerSpawned(true);
+    }
+
+    // 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 CClientPlayer::Reset()
 {
     // stats

Client/mods/deathmatch/logic/CClientPlayer.h

@@ -66,6 +66,14 @@ 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);
+
+    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; }
@@ -116,6 +124,8 @@ 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

@@ -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->IsPlayerSpawned();
+}
+
+
 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/CMapManager.cpp

@@ -592,6 +592,7 @@ 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/CPlayer.h

@@ -104,6 +104,9 @@ 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);
@@ -465,4 +468,6 @@ class CPlayer final : public CPed, public CClient
 
     ushort  m_usPrevDimension;
     SString m_strQuitReasonForLog;
+
+    bool m_bHasPlayerSpawned;
 };

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->IsPlayerSpawned();
+}
+
 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);