UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some badness with the player initialization moving.

Browse Source
This commit is contained in:
Nicholas Hastings 2015-05-11 20:29:00 -04:00
parent 8fc689c89a
commit 91b2ab8be1
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/PlayerManager.cpp
View File

@ -138,8 +138,6 @@ PlayerManager::PlayerManager()
m_UserIdLookUp = new int[USHRT_MAX+1]; m_UserIdLookUp = new int[USHRT_MAX+1];
memset(m_UserIdLookUp, 0, sizeof(int) * (USHRT_MAX+1)); memset(m_UserIdLookUp, 0, sizeof(int) * (USHRT_MAX+1));
InitializePlayers();
} }
PlayerManager::~PlayerManager() PlayerManager::~PlayerManager()
@ -150,14 +148,13 @@ PlayerManager::~PlayerManager()
delete [] m_UserIdLookUp; delete [] m_UserIdLookUp;
} }
void PlayerManager::InitializePlayers() void PlayerManager::OnSourceModStartup(bool late)
{ {
/* Initialize all players */ /* Initialize all players */
m_PlayerCount = 0; m_PlayerCount = 0;
m_Players = new CPlayer[SM_MAXPLAYERS + 1]; m_Players = new CPlayer[SM_MAXPLAYERS + 1];
m_AuthQueue = new unsigned int[SM_MAXPLAYERS + 1]; m_AuthQueue = new unsigned int[SM_MAXPLAYERS + 1];
m_FirstPass = true;
memset(m_AuthQueue, 0, sizeof(unsigned int) * (SM_MAXPLAYERS + 1)); memset(m_AuthQueue, 0, sizeof(unsigned int) * (SM_MAXPLAYERS + 1));
@ -309,12 +306,8 @@ void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int cl
#endif #endif
m_PlayersSinceActive = 0; m_PlayersSinceActive = 0;
if (!m_FirstPass)
{
InitializePlayers();
}
g_OnMapStarted = true; g_OnMapStarted = true;
m_FirstPass = true;
#if SOURCE_ENGINE == SE_DOTA #if SOURCE_ENGINE == SE_DOTA
extsys->CallOnCoreMapStart(gpGlobals->pEdicts, gpGlobals->maxEntities, gpGlobals->maxClients); extsys->CallOnCoreMapStart(gpGlobals->pEdicts, gpGlobals->maxEntities, gpGlobals->maxClients);
@ -1828,11 +1821,6 @@ void PlayerManager::OnSourceModMaxPlayersChanged( int newvalue )
void PlayerManager::MaxPlayersChanged( int newvalue /*= -1*/ ) void PlayerManager::MaxPlayersChanged( int newvalue /*= -1*/ )
{ {
if (!m_FirstPass)
{
return;
}
if (newvalue == -1) if (newvalue == -1)
{ {
newvalue = gpGlobals->maxClients; newvalue = gpGlobals->maxClients;

1
core/PlayerManager.h
View File

@ -154,6 +154,7 @@ public:
PlayerManager(); PlayerManager();
~PlayerManager(); ~PlayerManager();
public: //SMGlobalClass public: //SMGlobalClass
void OnSourceModStartup(bool late) override;
void OnSourceModAllInitialized(); void OnSourceModAllInitialized();
void OnSourceModShutdown(); void OnSourceModShutdown();
void OnSourceModLevelEnd(); void OnSourceModLevelEnd();