Merge.
Merge.
1.1 --- a/core/PlayerManager.cpp Tue May 12 12:59:11 2009 -0400
1.2 +++ b/core/PlayerManager.cpp Tue May 12 17:26:47 2009 -0400
1.3 @@ -1327,11 +1327,6 @@
1.4
1.5 void PlayerManager::MaxPlayersChanged( int newvalue /*= -1*/ )
1.6 {
1.7 - if (!m_FirstPass)
1.8 - {
1.9 - return;
1.10 - }
1.11 -
1.12 if (newvalue == -1)
1.13 {
1.14 newvalue = gpGlobals->maxClients;
2.1 --- a/extensions/clientprefs/cookie.h Tue May 12 12:59:11 2009 -0400
2.2 +++ b/extensions/clientprefs/cookie.h Tue May 12 17:26:47 2009 -0400
2.3 @@ -139,7 +139,7 @@
2.4
2.5 private:
2.6 KTrie<Cookie *> cookieTrie;
2.7 - SourceHook::List<CookieData *> clientData[MAXCLIENTS+1];
2.8 + SourceHook::List<CookieData *> clientData[MAXCLIENTS];
2.9
2.10 bool connected[MAXCLIENTS+1];
2.11 bool statsLoaded[MAXCLIENTS+1];