1.1 --- a/core/PlayerManager.cpp Thu Mar 15 04:34:42 2007 +0000
1.2 +++ b/core/PlayerManager.cpp Thu Mar 15 04:45:17 2007 +0000
1.3 @@ -17,7 +17,7 @@
1.4 #include "AdminCache.h"
1.5 #include "ConCmdManager.h"
1.6
1.7 -CPlayerManager g_Players;
1.8 +PlayerManager g_Players;
1.9
1.10 SH_DECL_HOOK5(IServerGameClients, ClientConnect, SH_NOATTRIB, 0, bool, edict_t *, const char *, const char *, char *, int);
1.11 SH_DECL_HOOK2_void(IServerGameClients, ClientPutInServer, SH_NOATTRIB, 0, edict_t *, const char *);
1.12 @@ -26,27 +26,27 @@
1.13 SH_DECL_HOOK1_void(IServerGameClients, ClientSettingsChanged, SH_NOATTRIB, 0, edict_t *);
1.14 SH_DECL_HOOK3_void(IServerGameDLL, ServerActivate, SH_NOATTRIB, 0, edict_t *, int, int);
1.15
1.16 -CPlayerManager::CPlayerManager()
1.17 +PlayerManager::PlayerManager()
1.18 {
1.19 m_AuthQueue = NULL;
1.20 m_FirstPass = true;
1.21 }
1.22
1.23 -CPlayerManager::~CPlayerManager()
1.24 +PlayerManager::~PlayerManager()
1.25 {
1.26 delete [] m_AuthQueue;
1.27 }
1.28
1.29 -void CPlayerManager::OnSourceModAllInitialized()
1.30 +void PlayerManager::OnSourceModAllInitialized()
1.31 {
1.32 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &CPlayerManager::OnClientConnect, false);
1.33 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &CPlayerManager::OnClientConnect_Post, true);
1.34 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &CPlayerManager::OnClientPutInServer, true);
1.35 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &CPlayerManager::OnClientDisconnect, false);
1.36 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &CPlayerManager::OnClientDisconnect_Post, true);
1.37 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &CPlayerManager::OnClientCommand, false);
1.38 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientSettingsChanged, serverClients, this, &CPlayerManager::OnClientSettingsChanged, true);
1.39 - SH_ADD_HOOK_MEMFUNC(IServerGameDLL, ServerActivate, gamedll, this, &CPlayerManager::OnServerActivate, true);
1.40 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &PlayerManager::OnClientConnect, false);
1.41 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &PlayerManager::OnClientConnect_Post, true);
1.42 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &PlayerManager::OnClientPutInServer, true);
1.43 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect, false);
1.44 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect_Post, true);
1.45 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &PlayerManager::OnClientCommand, false);
1.46 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientSettingsChanged, serverClients, this, &PlayerManager::OnClientSettingsChanged, true);
1.47 + SH_ADD_HOOK_MEMFUNC(IServerGameDLL, ServerActivate, gamedll, this, &PlayerManager::OnServerActivate, true);
1.48
1.49 g_ShareSys.AddInterface(NULL, this);
1.50
1.51 @@ -62,15 +62,15 @@
1.52 m_clauth = g_Forwards.CreateForward("OnClientAuthorized", ET_Ignore, 2, NULL, Param_Cell, Param_String);
1.53 }
1.54
1.55 -void CPlayerManager::OnSourceModShutdown()
1.56 +void PlayerManager::OnSourceModShutdown()
1.57 {
1.58 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &CPlayerManager::OnClientConnect, false);
1.59 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &CPlayerManager::OnClientPutInServer, true);
1.60 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &CPlayerManager::OnClientDisconnect, false);
1.61 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &CPlayerManager::OnClientDisconnect_Post, true);
1.62 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &CPlayerManager::OnClientCommand, false);
1.63 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientSettingsChanged, serverClients, this, &CPlayerManager::OnClientSettingsChanged, true);
1.64 - SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, ServerActivate, gamedll, this, &CPlayerManager::OnServerActivate, true);
1.65 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &PlayerManager::OnClientConnect, false);
1.66 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &PlayerManager::OnClientPutInServer, true);
1.67 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect, false);
1.68 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect_Post, true);
1.69 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &PlayerManager::OnClientCommand, false);
1.70 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientSettingsChanged, serverClients, this, &PlayerManager::OnClientSettingsChanged, true);
1.71 + SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, ServerActivate, gamedll, this, &PlayerManager::OnServerActivate, true);
1.72
1.73 /* Release forwards */
1.74 g_Forwards.ReleaseForward(m_clconnect);
1.75 @@ -84,7 +84,7 @@
1.76 delete [] m_Players;
1.77 }
1.78
1.79 -void CPlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
1.80 +void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
1.81 {
1.82 if (m_FirstPass)
1.83 {
1.84 @@ -99,7 +99,7 @@
1.85 }
1.86 }
1.87
1.88 -void CPlayerManager::RunAuthChecks()
1.89 +void PlayerManager::RunAuthChecks()
1.90 {
1.91 CPlayer *pPlayer;
1.92 const char *authstr;
1.93 @@ -168,7 +168,7 @@
1.94 }
1.95 }
1.96
1.97 -bool CPlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen)
1.98 +bool PlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen)
1.99 {
1.100 int client = engine->IndexOfEdict(pEntity);
1.101
1.102 @@ -202,7 +202,7 @@
1.103 return true;
1.104 }
1.105
1.106 -bool CPlayerManager::OnClientConnect_Post(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen)
1.107 +bool PlayerManager::OnClientConnect_Post(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen)
1.108 {
1.109 int client = engine->IndexOfEdict(pEntity);
1.110 bool orig_value = META_RESULT_ORIG_RET(bool);
1.111 @@ -220,7 +220,7 @@
1.112 return true;
1.113 }
1.114
1.115 -void CPlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername)
1.116 +void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername)
1.117 {
1.118 cell_t res;
1.119 int client = engine->IndexOfEdict(pEntity);
1.120 @@ -258,7 +258,7 @@
1.121 m_clputinserver->Execute(&res, NULL);
1.122 }
1.123
1.124 -void CPlayerManager::OnClientDisconnect(edict_t *pEntity)
1.125 +void PlayerManager::OnClientDisconnect(edict_t *pEntity)
1.126 {
1.127 cell_t res;
1.128 int client = engine->IndexOfEdict(pEntity);
1.129 @@ -306,7 +306,7 @@
1.130 m_Players[client].Disconnect();
1.131 }
1.132
1.133 -void CPlayerManager::OnClientDisconnect_Post(edict_t *pEntity)
1.134 +void PlayerManager::OnClientDisconnect_Post(edict_t *pEntity)
1.135 {
1.136 cell_t res;
1.137 int client = engine->IndexOfEdict(pEntity);
1.138 @@ -323,7 +323,7 @@
1.139 }
1.140 }
1.141
1.142 -void CPlayerManager::OnClientCommand(edict_t *pEntity)
1.143 +void PlayerManager::OnClientCommand(edict_t *pEntity)
1.144 {
1.145 cell_t res = Pl_Continue;
1.146 int client = engine->IndexOfEdict(pEntity);
1.147 @@ -347,7 +347,7 @@
1.148 }
1.149 }
1.150
1.151 -void CPlayerManager::OnClientSettingsChanged(edict_t *pEntity)
1.152 +void PlayerManager::OnClientSettingsChanged(edict_t *pEntity)
1.153 {
1.154 cell_t res;
1.155 int client = engine->IndexOfEdict(pEntity);
1.156 @@ -357,12 +357,12 @@
1.157 m_Players[client].SetName(engine->GetClientConVarValue(client, "name"));
1.158 }
1.159
1.160 -int CPlayerManager::GetMaxClients()
1.161 +int PlayerManager::GetMaxClients()
1.162 {
1.163 return m_maxClients;
1.164 }
1.165
1.166 -CPlayer *CPlayerManager::GetPlayerByIndex(int client) const
1.167 +CPlayer *PlayerManager::GetPlayerByIndex(int client) const
1.168 {
1.169 if (client > m_maxClients || client < 1)
1.170 {
1.171 @@ -371,33 +371,33 @@
1.172 return &m_Players[client];
1.173 }
1.174
1.175 -int CPlayerManager::GetNumPlayers()
1.176 +int PlayerManager::GetNumPlayers()
1.177 {
1.178 return m_PlayerCount;
1.179 }
1.180
1.181 -void CPlayerManager::AddClientListener(IClientListener *listener)
1.182 +void PlayerManager::AddClientListener(IClientListener *listener)
1.183 {
1.184 m_hooks.push_back(listener);
1.185 }
1.186
1.187 -void CPlayerManager::RemoveClientListener(IClientListener *listener)
1.188 +void PlayerManager::RemoveClientListener(IClientListener *listener)
1.189 {
1.190 m_hooks.remove(listener);
1.191 }
1.192
1.193 -IGamePlayer *CPlayerManager::GetGamePlayer(edict_t *pEdict)
1.194 +IGamePlayer *PlayerManager::GetGamePlayer(edict_t *pEdict)
1.195 {
1.196 int index = engine->IndexOfEdict(pEdict);
1.197 return GetGamePlayer(index);
1.198 }
1.199
1.200 -IGamePlayer *CPlayerManager::GetGamePlayer(int client)
1.201 +IGamePlayer *PlayerManager::GetGamePlayer(int client)
1.202 {
1.203 return GetPlayerByIndex(client);
1.204 }
1.205
1.206 -void CPlayerManager::ClearAdminId(AdminId id)
1.207 +void PlayerManager::ClearAdminId(AdminId id)
1.208 {
1.209 for (int i=1; i<=m_maxClients; i++)
1.210 {
1.211 @@ -408,7 +408,7 @@
1.212 }
1.213 }
1.214
1.215 -void CPlayerManager::ClearAllAdmins()
1.216 +void PlayerManager::ClearAllAdmins()
1.217 {
1.218 for (int i=1; i<=m_maxClients; i++)
1.219 {
