Refactored player joined flag

Author: ccw808

Server/mods/deathmatch/logic/CGame.cpp

@@ -1243,7 +1243,7 @@ void CGame::InitialDataStream(CPlayer& Player)
     marker.Set("SetParentObject");
 
     // He's joined now
-    Player.SetStatus(STATUS_JOINED);
+    Player.SetJoined();
     m_pPlayerManager->OnPlayerJoin(&Player);
 
     // Console
@@ -1375,7 +1375,7 @@ void CGame::QuitPlayer(CPlayer& Player, CClient::eQuitReasons Reason, bool bSayI
     }
 
     // If he had joined
-    if (Player.GetStatus() == STATUS_JOINED)
+    if (Player.IsJoined())
     {
         // Tell our scripts the player has quit, but only if the scripts got told he joined
         CLuaArguments Arguments;
@@ -1788,7 +1788,7 @@ void CGame::Packet_PlayerJoinData(CPlayerJoinDataPacket& Packet)
                                 // Add him to the whowas list
                                 m_WhoWas.Add(szNick, Packet.GetSourceIP(), pPlayer->GetSerial(), pPlayer->GetPlayerVersion(), pPlayer->GetAccount()->GetName());
 
-                                PlayerCompleteConnect(pPlayer, true, NULL);
+                                PlayerCompleteConnect(pPlayer);
                             }
                             else
                             {
@@ -3638,7 +3638,7 @@ void CGame::Packet_CameraSync(CCameraSyncPacket& Packet)
 void CGame::Packet_PlayerTransgression(CPlayerTransgressionPacket& Packet)
 {
     CPlayer* pPlayer = Packet.GetSourcePlayer();
-    if (pPlayer && pPlayer->IsJoined())
+    if (pPlayer)
     {
         // If ac# not disabled on this server, do a kick
         if (!g_pGame->GetConfig()->IsDisableAC(SString("%d", Packet.m_uiLevel)))
@@ -3875,51 +3875,39 @@ void CGame::Packet_PlayerACInfo(CPlayerACInfoPacket& Packet)
     }
 }
 
-void CGame::PlayerCompleteConnect(CPlayer* pPlayer, bool bSuccess, const char* szError)
+void CGame::PlayerCompleteConnect(CPlayer* pPlayer)
 {
     SString strIPAndSerial("IP: %s  Serial: %s  Version: %s", pPlayer->GetSourceIP(), pPlayer->GetSerial().c_str(), pPlayer->GetPlayerVersion().c_str());
-    if (bSuccess)
+    // Call the onPlayerConnect event. If it returns false, disconnect the player
+    CLuaArguments Arguments;
+    Arguments.PushString(pPlayer->GetNick());
+    Arguments.PushString(pPlayer->GetSourceIP());
+    Arguments.PushString(pPlayer->GetSerialUser().c_str());
+    Arguments.PushString(pPlayer->GetSerial().c_str());
+    Arguments.PushNumber(pPlayer->GetMTAVersion());
+    Arguments.PushString(pPlayer->GetPlayerVersion());
+    if (!g_pGame->GetMapManager()->GetRootElement()->CallEvent("onPlayerConnect", Arguments))
     {
-        // Call the onPlayerConnect event. If it returns false, disconnect the player
-        CLuaArguments Arguments;
-        Arguments.PushString(pPlayer->GetNick());
-        Arguments.PushString(pPlayer->GetSourceIP());
-        Arguments.PushString(pPlayer->GetSerialUser().c_str());
-        Arguments.PushString(pPlayer->GetSerial().c_str());
-        Arguments.PushNumber(pPlayer->GetMTAVersion());
-        Arguments.PushString(pPlayer->GetPlayerVersion());
-        if (!g_pGame->GetMapManager()->GetRootElement()->CallEvent("onPlayerConnect", Arguments))
+        // event cancelled, disconnect the player
+        CLogger::LogPrintf("CONNECT: %s failed to connect. (onPlayerConnect event cancelled) (%s)\n", pPlayer->GetNick(), strIPAndSerial.c_str());
+        const char* szError = g_pGame->GetEvents()->GetLastError();
+        if (szError && szError[0])
         {
-            // event cancelled, disconnect the player
-            CLogger::LogPrintf("CONNECT: %s failed to connect. (onPlayerConnect event cancelled) (%s)\n", pPlayer->GetNick(), strIPAndSerial.c_str());
-            const char* szError = g_pGame->GetEvents()->GetLastError();
-            if (szError && szError[0])
-            {
-                DisconnectPlayer(g_pGame, *pPlayer, szError);
-                return;
-            }
-            DisconnectPlayer(g_pGame, *pPlayer, CPlayerDisconnectedPacket::GENERAL_REFUSED);
+            DisconnectPlayer(g_pGame, *pPlayer, szError);
             return;
         }
+        DisconnectPlayer(g_pGame, *pPlayer, CPlayerDisconnectedPacket::GENERAL_REFUSED);
+        return;
+    }
 
-        // Tell the console
-        CLogger::LogPrintf("CONNECT: %s connected (%s)\n", pPlayer->GetNick(), strIPAndSerial.c_str());
+    // Tell the console
+    CLogger::LogPrintf("CONNECT: %s connected (%s)\n", pPlayer->GetNick(), strIPAndSerial.c_str());
 
-        // Send him the join details
-        pPlayer->Send(CPlayerConnectCompletePacket());
+    // 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);
-    }
-    else
-    {
-        CLogger::LogPrintf("CONNECT: %s failed to connect (Invalid serial) (%s)\n", pPlayer->GetNick(), strIPAndSerial.c_str());
-        if (szError && strlen(szError) > 0)
-            DisconnectPlayer(g_pGame, *pPlayer, szError);
-        else
-            DisconnectPlayer(g_pGame, *pPlayer, CPlayerDisconnectedPacket::SERIAL_VERIFICATION);
-        return;
-    }
+    // The player is spawned when he's connected, just the Camera is not faded in/not targetting
+    pPlayer->SetSpawned(true);
 }
 
 void CGame::Lock(void)

Server/mods/deathmatch/logic/CGame.h

@@ -497,7 +497,7 @@ class CGame
     void Packet_PlayerNoSocket(class CPlayerNoSocketPacket& Packet);
     void Packet_PlayerNetworkStatus(class CPlayerNetworkStatusPacket& Packet);
 
-    static void PlayerCompleteConnect(CPlayer* pPlayer, bool bSuccess, const char* szError);
+    static void PlayerCompleteConnect(CPlayer* pPlayer);
 
     // Technically, this could be put somewhere else.  It's a callback function
     // which the voice server library will call to send out data.

Server/mods/deathmatch/logic/CPlayer.cpp

@@ -33,11 +33,10 @@ CPlayer::CPlayer(CPlayerManager* pPlayerManager, class CScriptDebugging* pScript
     m_usMTAVersion = 0;
     m_usBitStreamVersion = 0;
     m_bIsMuted = false;
+    m_bIsJoined = false;
     m_lMoney = 0;
     m_bNametagColorOverridden = false;
 
-    m_iStatus = STATUS_CONNECTED;
-
     m_fRotation = 0.0f;
     m_fAimDirection = 0.0f;
     m_ucDriveByDirection = 0;
@@ -183,7 +182,7 @@ void CPlayer::Unlink(void)
 
 void CPlayer::DoPulse(void)
 {
-    if (GetStatus() == STATUS_JOINED)
+    if (IsJoined())
     {
         if (m_pPlayerTextManager != NULL)
             m_pPlayerTextManager->Process();

Server/mods/deathmatch/logic/CPlayer.h

@@ -26,13 +26,6 @@ class CPlayer;
 class CKeyBinds;
 class CPlayerCamera;
 
-enum
-{
-    STATUS_CONNECTED,
-    STATUS_VERIFYING,
-    STATUS_JOINED,
-};
-
 enum eVoiceState
 {
     VOICESTATE_IDLE = 0,
@@ -106,12 +99,8 @@ class CPlayer : public CPed, public CClient
 
     bool IsMuted(void) { return m_bIsMuted; };
     void SetMuted(bool bSetMuted) { m_bIsMuted = bSetMuted; };
-
-    int  GetStatus(void) { return m_iStatus; };
-    void SetStatus(int iStatus) { m_iStatus = iStatus; };
-
-    bool IsIngame(void) { return m_iStatus >= STATUS_VERIFYING; };
-    bool IsJoined(void) { return m_iStatus == STATUS_JOINED; };
+    bool IsJoined(void) { return m_bIsJoined; }
+    void SetJoined(void) { m_bIsJoined = true; }
 
     float GetCameraRotation(void) { return m_fCameraRotation; };
     void  SetCameraRotation(float fRotation) { m_fCameraRotation = fRotation; };
@@ -359,7 +348,7 @@ class CPlayer : public CPed, public CClient
     unsigned short m_usBitStreamVersion;
     SString        m_strPlayerVersion;
     bool           m_bIsMuted;
-    int            m_iStatus;
+    bool           m_bIsJoined;
 
     bool m_bNametagColorOverridden;
 

Server/mods/deathmatch/logic/CPlayerManager.cpp

@@ -46,7 +46,7 @@ void CPlayerManager::PulseZombieCheck(void)
     {
         CPlayer* pPlayer = *iter;
 
-        if (pPlayer->GetStatus() == STATUS_CONNECTED)
+        if (pPlayer->IsJoined() == false)
         {
             // Remove any players that have been connected for very long (90 sec) but haven't reached the verifying step
             if (pPlayer->GetTimeSinceConnected() > 90000)
@@ -95,14 +95,14 @@ CPlayer* CPlayerManager::Create(const NetServerPlayerID& PlayerSocket)
     return pPlayer;
 }
 
-unsigned int CPlayerManager::CountWithStatus(int iStatus)
+unsigned int CPlayerManager::CountJoined(void)
 {
     // Count each ingame player
     unsigned int                   uiCount = 0;
     list<CPlayer*>::const_iterator iter = m_Players.begin();
     for (; iter != m_Players.end(); iter++)
     {
-        if ((*iter)->GetStatus() == iStatus)
+        if ((*iter)->IsJoined())
         {
             ++uiCount;
         }

Server/mods/deathmatch/logic/CPlayerManager.h

@@ -34,14 +34,9 @@ class CPlayerManager
     CPlayer* Create(const NetServerPlayerID& PlayerSocket);
     void     DeleteAll(void);
 
-    unsigned int Count(void)
-    {
-        return static_cast<unsigned int>(m_Players.size());
-        ;
-    };
-    unsigned int CountJoined(void) { return CountWithStatus(STATUS_JOINED); };
-    unsigned int CountWithStatus(int iStatus);
-    bool         Exists(CPlayer* pPlayer);
+    unsigned int Count(void) { return static_cast<unsigned int>(m_Players.size()); }
+    unsigned int CountJoined(void);
+    bool Exists(CPlayer* pPlayer);
 
     CPlayer* Get(const NetServerPlayerID& PlayerSocket);
     CPlayer* Get(const char* szNick, bool bCaseSensitive = false);

Server/mods/deathmatch/logic/CRPCFunctions.cpp

@@ -86,7 +86,7 @@ void CRPCFunctions::PlayerInGameNotice(NetBitStreamInterface& bitStream)
 {
     CLOCK("NetServerPulse::RPC", "PlayerInGameNotice");
     // Already ingame? Protocol error
-    if (m_pSourcePlayer->IsIngame())
+    if (m_pSourcePlayer->IsJoined())
     {
         DisconnectPlayer(g_pGame, *m_pSourcePlayer, "Protocol error: Already ingame");
     }

Server/mods/deathmatch/logic/net/CNetBuffer.cpp

@@ -1227,6 +1227,20 @@ void CNetServerBuffer::ProcessPacket(unsigned char ucPacketID, const NetServerPl
         // Reset bitstream pointer so game can also read the packet data
         BitStream->ResetReadPointer();
     }
+    else if (ucPacketID == PACKET_ID_SERVER_DISCONNECTED)
+    {
+        // Handle request from net module to immediately send disconnected packet
+        uchar   m_eType;
+        SString strReason;
+        BitStream->Read(m_eType);
+        BitStream->ReadString(strReason);
+        NetBitStreamInterface*    pSendBitStream = g_pRealNetServer->AllocateNetServerBitStream(BitStream->Version());
+        CPlayerDisconnectedPacket packet((CPlayerDisconnectedPacket::ePlayerDisconnectType)m_eType, strReason);
+        packet.Write(*pSendBitStream);
+        g_pRealNetServer->SendPacket(packet.GetPacketID(), Socket, pSendBitStream, false, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
+        g_pRealNetServer->DeallocateNetServerBitStream(pSendBitStream);
+        return;
+    }
 
     ms_StatsRecvNumMessages++;
 

Server/mods/deathmatch/logic/net/CSimPlayer.h

@@ -25,13 +25,13 @@ class CSimPlayer
     CSimPlayer(void) { DEBUG_CREATE_COUNT("CSimPlayer"); }
     ~CSimPlayer(void) { DEBUG_DESTROY_COUNT("CSimPlayer"); }
 
-    bool                                      IsJoined(void) { return m_iStatus == STATUS_JOINED; };
+    bool                                      IsJoined(void) { return m_bIsJoined; };
     const std::multimap<ushort, CSimPlayer*>& GetPuresyncSendList(void);
     unsigned short                            GetBitStreamVersion(void) { return m_usBitStreamVersion; };
     NetServerPlayerID&                        GetSocket(void) { return m_PlayerSocket; };
 
     // General synced vars
-    int                                m_iStatus;
+    bool                               m_bIsJoined;
     unsigned short                     m_usBitStreamVersion;
     NetServerPlayerID                  m_PlayerSocket;
     std::vector<CSimPlayer*>           m_PuresyncSendListFlat;

Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp

@@ -127,7 +127,7 @@ void CSimPlayerManager::UpdateSimPlayer(CPlayer* pPlayer)
     //
     CVehicle* pVehicle = pPlayer->GetOccupiedVehicle();
 
-    pSim->m_iStatus = pPlayer->GetStatus();
+    pSim->m_bIsJoined = pPlayer->IsJoined();
     pSim->m_usBitStreamVersion = pPlayer->GetBitStreamVersion();
     pSim->m_bHasOccupiedVehicle = pVehicle != NULL;
     pSim->m_PlayerID = pPlayer->GetID();