1.1 --- a/core/DebugReporter.cpp Thu Mar 15 04:34:42 2007 +0000
1.2 +++ b/core/DebugReporter.cpp Thu Mar 15 04:45:17 2007 +0000
1.3 @@ -15,14 +15,14 @@
1.4 #include "Logger.h"
1.5 #include "PluginSys.h"
1.6
1.7 -CDbgReporter g_DbgReporter;
1.8 +DebugReport g_DbgReporter;
1.9
1.10 -void CDbgReporter::OnSourceModAllInitialized()
1.11 +void DebugReport::OnSourceModAllInitialized()
1.12 {
1.13 g_pSourcePawn->SetDebugListener(this);
1.14 }
1.15
1.16 -void CDbgReporter::OnContextExecuteError(IPluginContext *ctx, IContextTrace *error)
1.17 +void DebugReport::OnContextExecuteError(IPluginContext *ctx, IContextTrace *error)
1.18 {
1.19 const char *lastname;
1.20 const char *plname = g_PluginSys.FindPluginByContext(ctx->GetContext())->GetFilename();
1.21 @@ -68,7 +68,7 @@
1.22 }
1.23 }
1.24
1.25 -int CDbgReporter::_GetPluginIndex(IPluginContext *ctx)
1.26 +int DebugReport::_GetPluginIndex(IPluginContext *ctx)
1.27 {
1.28 int id = 1;
1.29 IPluginIterator *iter = g_PluginSys.GetPluginIterator();
2.1 --- a/core/DebugReporter.h Thu Mar 15 04:34:42 2007 +0000
2.2 +++ b/core/DebugReporter.h Thu Mar 15 04:45:17 2007 +0000
2.3 @@ -17,7 +17,7 @@
2.4 #include "sp_vm_api.h"
2.5 #include "sm_globals.h"
2.6
2.7 -class CDbgReporter :
2.8 +class DebugReport :
2.9 public SMGlobalClass,
2.10 public IDebugListener
2.11 {
2.12 @@ -29,7 +29,7 @@
2.13 int _GetPluginIndex(IPluginContext *ctx);
2.14 };
2.15
2.16 -extern CDbgReporter g_DbgReporter;
2.17 +extern DebugReport g_DbgReporter;
2.18
2.19 #endif // _INCLUDE_SOURCEMOD_CDBGREPORTER_H_
2.20
3.1 --- a/core/GameConfigs.cpp Thu Mar 15 04:34:42 2007 +0000
3.2 +++ b/core/GameConfigs.cpp Thu Mar 15 04:45:17 2007 +0000
3.3 @@ -22,7 +22,7 @@
3.4 #include "Logger.h"
3.5 #include "ShareSys.h"
3.6
3.7 -CGameConfigManager g_GameConfigs;
3.8 +GameConfigManager g_GameConfigs;
3.9 IGameConfig *g_pGameConf = NULL;
3.10 char g_mod[255];
3.11
3.12 @@ -285,17 +285,17 @@
3.13 return m_RefCount;
3.14 }
3.15
3.16 -CGameConfigManager::CGameConfigManager()
3.17 +GameConfigManager::GameConfigManager()
3.18 {
3.19 m_pLookup = sm_trie_create();
3.20 }
3.21
3.22 -CGameConfigManager::~CGameConfigManager()
3.23 +GameConfigManager::~GameConfigManager()
3.24 {
3.25 sm_trie_destroy(m_pLookup);
3.26 }
3.27
3.28 -void CGameConfigManager::OnSourceModStartup(bool late)
3.29 +void GameConfigManager::OnSourceModStartup(bool late)
3.30 {
3.31 LoadGameConfigFile("core.games", &g_pGameConf, NULL, 0);
3.32
3.33 @@ -323,7 +323,7 @@
3.34 }
3.35 }
3.36
3.37 -void CGameConfigManager::OnSourceModAllInitialized()
3.38 +void GameConfigManager::OnSourceModAllInitialized()
3.39 {
3.40 /* NOW initialize the game file */
3.41 CGameConfig *pGameConf = (CGameConfig *)g_pGameConf;
3.42 @@ -337,12 +337,12 @@
3.43 g_ShareSys.AddInterface(NULL, this);
3.44 }
3.45
3.46 -void CGameConfigManager::OnSourceModAllShutdown()
3.47 +void GameConfigManager::OnSourceModAllShutdown()
3.48 {
3.49 CloseGameConfigFile(g_pGameConf);
3.50 }
3.51
3.52 -bool CGameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **_pConfig, char *error, size_t maxlength)
3.53 +bool GameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **_pConfig, char *error, size_t maxlength)
3.54 {
3.55 CGameConfig *pConfig;
3.56
3.57 @@ -372,7 +372,7 @@
3.58 return retval;
3.59 }
3.60
3.61 -void CGameConfigManager::CloseGameConfigFile(IGameConfig *cfg)
3.62 +void GameConfigManager::CloseGameConfigFile(IGameConfig *cfg)
3.63 {
3.64 CGameConfig *pConfig = (CGameConfig *)cfg;
3.65
4.1 --- a/core/GameConfigs.h Thu Mar 15 04:34:42 2007 +0000
4.2 +++ b/core/GameConfigs.h Thu Mar 15 04:45:17 2007 +0000
4.3 @@ -63,13 +63,13 @@
4.4 char m_mod[255];
4.5 };
4.6
4.7 -class CGameConfigManager :
4.8 +class GameConfigManager :
4.9 public IGameConfigManager,
4.10 public SMGlobalClass
4.11 {
4.12 public:
4.13 - CGameConfigManager();
4.14 - ~CGameConfigManager();
4.15 + GameConfigManager();
4.16 + ~GameConfigManager();
4.17 public: //IGameConfigManager
4.18 bool LoadGameConfigFile(const char *file, IGameConfig **pConfig, char *error, size_t maxlength);
4.19 void CloseGameConfigFile(IGameConfig *cfg);
4.20 @@ -82,7 +82,7 @@
4.21 Trie *m_pLookup;
4.22 };
4.23
4.24 -extern CGameConfigManager g_GameConfigs;
4.25 +extern GameConfigManager g_GameConfigs;
4.26 extern IGameConfig *g_pGameConf;
4.27
4.28 #endif //_INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
5.1 --- a/core/Logger.cpp Thu Mar 15 04:34:42 2007 +0000
5.2 +++ b/core/Logger.cpp Thu Mar 15 04:45:17 2007 +0000
5.3 @@ -18,24 +18,24 @@
5.4 #include "systems/LibrarySys.h"
5.5 #include "sm_version.h"
5.6
5.7 -CLogger g_Logger;
5.8 +Logger g_Logger;
5.9
5.10 /**
5.11 * :TODO: This should be creating the log folder if it doesn't exist
5.12 */
5.13
5.14 -void CLogger::OnSourceModStartup(bool late)
5.15 +void Logger::OnSourceModStartup(bool late)
5.16 {
5.17 //:TODO: read these options from a file, dont hardcode them
5.18 InitLogger(LoggingMode_Daily, true);
5.19 }
5.20
5.21 -void CLogger::OnSourceModAllShutdown()
5.22 +void Logger::OnSourceModAllShutdown()
5.23 {
5.24 CloseLogger();
5.25 }
5.26
5.27 -void CLogger::_NewMapFile()
5.28 +void Logger::_NewMapFile()
5.29 {
5.30 if (!m_Active)
5.31 {
5.32 @@ -76,7 +76,7 @@
5.33 }
5.34 }
5.35
5.36 -void CLogger::_CloseFile()
5.37 +void Logger::_CloseFile()
5.38 {
5.39 if (!m_Active)
5.40 {
5.41 @@ -110,7 +110,7 @@
5.42 m_ErrFileName.clear();
5.43 }
5.44
5.45 -void CLogger::InitLogger(LoggingMode mode, bool startlogging)
5.46 +void Logger::InitLogger(LoggingMode mode, bool startlogging)
5.47 {
5.48 m_mode = mode;
5.49 m_Active = startlogging;
5.50 @@ -149,12 +149,12 @@
5.51 }
5.52 }
5.53
5.54 -void CLogger::CloseLogger()
5.55 +void Logger::CloseLogger()
5.56 {
5.57 _CloseFile();
5.58 }
5.59
5.60 -void CLogger::LogMessage(const char *vafmt, ...)
5.61 +void Logger::LogMessage(const char *vafmt, ...)
5.62 {
5.63 if (!m_Active)
5.64 {
5.65 @@ -233,7 +233,7 @@
5.66 m_Active = false;
5.67 }
5.68
5.69 -void CLogger::LogError(const char *vafmt, ...)
5.70 +void Logger::LogError(const char *vafmt, ...)
5.71 {
5.72 if (!m_Active)
5.73 {
5.74 @@ -282,7 +282,7 @@
5.75 g_SMAPI->ConPrintf("L %s: %s\n", date, msg);
5.76 }
5.77
5.78 -void CLogger::MapChange(const char *mapname)
5.79 +void Logger::MapChange(const char *mapname)
5.80 {
5.81 m_CurMapName.assign(mapname);
5.82
5.83 @@ -312,7 +312,7 @@
5.84 m_ErrMapStart = false;
5.85 }
5.86
5.87 -void CLogger::_PrintToHL2Log(const char *fmt, va_list ap)
5.88 +void Logger::_PrintToHL2Log(const char *fmt, va_list ap)
5.89 {
5.90 char msg[3072];
5.91 size_t len;
5.92 @@ -326,7 +326,7 @@
5.93 engine->LogPrint(msg);
5.94 }
5.95
5.96 -const char *CLogger::GetLogFileName(LogType type) const
5.97 +const char *Logger::GetLogFileName(LogType type) const
5.98 {
5.99 switch (type)
5.100 {
5.101 @@ -345,12 +345,12 @@
5.102 }
5.103 }
5.104
5.105 -LoggingMode CLogger::GetLoggingMode() const
5.106 +LoggingMode Logger::GetLoggingMode() const
5.107 {
5.108 return m_mode;
5.109 }
5.110
5.111 -void CLogger::EnableLogging()
5.112 +void Logger::EnableLogging()
5.113 {
5.114 if (m_Active)
5.115 {
5.116 @@ -360,7 +360,7 @@
5.117 LogMessage("Logging enabled manually by user.");
5.118 }
5.119
5.120 -void CLogger::DisableLogging()
5.121 +void Logger::DisableLogging()
5.122 {
5.123 if (!m_Active)
5.124 {
6.1 --- a/core/Logger.h Thu Mar 15 04:34:42 2007 +0000
6.2 +++ b/core/Logger.h Thu Mar 15 04:45:17 2007 +0000
6.3 @@ -32,10 +32,10 @@
6.4 LoggingMode_HL2
6.5 };
6.6
6.7 -class CLogger : public SMGlobalClass
6.8 +class Logger : public SMGlobalClass
6.9 {
6.10 public:
6.11 - CLogger() : m_ErrMapStart(false), m_Active(false), m_DelayedStart(false), m_DailyPrintHdr(false) {}
6.12 + Logger() : m_ErrMapStart(false), m_Active(false), m_DelayedStart(false), m_DailyPrintHdr(false) {}
6.13 public: //SMGlobalClass
6.14 void OnSourceModStartup(bool late);
6.15 void OnSourceModAllShutdown();
6.16 @@ -65,6 +65,6 @@
6.17 bool m_DailyPrintHdr;
6.18 };
6.19
6.20 -extern CLogger g_Logger;
6.21 +extern Logger g_Logger;
6.22
6.23 #endif // _INCLUDE_SOURCEMOD_CLOGGER_H_
7.1 --- a/core/PlayerManager.cpp Thu Mar 15 04:34:42 2007 +0000
7.2 +++ b/core/PlayerManager.cpp Thu Mar 15 04:45:17 2007 +0000
7.3 @@ -17,7 +17,7 @@
7.4 #include "AdminCache.h"
7.5 #include "ConCmdManager.h"
7.6
7.7 -CPlayerManager g_Players;
7.8 +PlayerManager g_Players;
7.9
7.10 SH_DECL_HOOK5(IServerGameClients, ClientConnect, SH_NOATTRIB, 0, bool, edict_t *, const char *, const char *, char *, int);
7.11 SH_DECL_HOOK2_void(IServerGameClients, ClientPutInServer, SH_NOATTRIB, 0, edict_t *, const char *);
7.12 @@ -26,27 +26,27 @@
7.13 SH_DECL_HOOK1_void(IServerGameClients, ClientSettingsChanged, SH_NOATTRIB, 0, edict_t *);
7.14 SH_DECL_HOOK3_void(IServerGameDLL, ServerActivate, SH_NOATTRIB, 0, edict_t *, int, int);
7.15
7.16 -CPlayerManager::CPlayerManager()
7.17 +PlayerManager::PlayerManager()
7.18 {
7.19 m_AuthQueue = NULL;
7.20 m_FirstPass = true;
7.21 }
7.22
7.23 -CPlayerManager::~CPlayerManager()
7.24 +PlayerManager::~PlayerManager()
7.25 {
7.26 delete [] m_AuthQueue;
7.27 }
7.28
7.29 -void CPlayerManager::OnSourceModAllInitialized()
7.30 +void PlayerManager::OnSourceModAllInitialized()
7.31 {
7.32 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &CPlayerManager::OnClientConnect, false);
7.33 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &CPlayerManager::OnClientConnect_Post, true);
7.34 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &CPlayerManager::OnClientPutInServer, true);
7.35 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &CPlayerManager::OnClientDisconnect, false);
7.36 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &CPlayerManager::OnClientDisconnect_Post, true);
7.37 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &CPlayerManager::OnClientCommand, false);
7.38 - SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientSettingsChanged, serverClients, this, &CPlayerManager::OnClientSettingsChanged, true);
7.39 - SH_ADD_HOOK_MEMFUNC(IServerGameDLL, ServerActivate, gamedll, this, &CPlayerManager::OnServerActivate, true);
7.40 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &PlayerManager::OnClientConnect, false);
7.41 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &PlayerManager::OnClientConnect_Post, true);
7.42 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &PlayerManager::OnClientPutInServer, true);
7.43 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect, false);
7.44 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect_Post, true);
7.45 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &PlayerManager::OnClientCommand, false);
7.46 + SH_ADD_HOOK_MEMFUNC(IServerGameClients, ClientSettingsChanged, serverClients, this, &PlayerManager::OnClientSettingsChanged, true);
7.47 + SH_ADD_HOOK_MEMFUNC(IServerGameDLL, ServerActivate, gamedll, this, &PlayerManager::OnServerActivate, true);
7.48
7.49 g_ShareSys.AddInterface(NULL, this);
7.50
7.51 @@ -62,15 +62,15 @@
7.52 m_clauth = g_Forwards.CreateForward("OnClientAuthorized", ET_Ignore, 2, NULL, Param_Cell, Param_String);
7.53 }
7.54
7.55 -void CPlayerManager::OnSourceModShutdown()
7.56 +void PlayerManager::OnSourceModShutdown()
7.57 {
7.58 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &CPlayerManager::OnClientConnect, false);
7.59 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &CPlayerManager::OnClientPutInServer, true);
7.60 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &CPlayerManager::OnClientDisconnect, false);
7.61 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &CPlayerManager::OnClientDisconnect_Post, true);
7.62 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &CPlayerManager::OnClientCommand, false);
7.63 - SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientSettingsChanged, serverClients, this, &CPlayerManager::OnClientSettingsChanged, true);
7.64 - SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, ServerActivate, gamedll, this, &CPlayerManager::OnServerActivate, true);
7.65 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientConnect, serverClients, this, &PlayerManager::OnClientConnect, false);
7.66 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientPutInServer, serverClients, this, &PlayerManager::OnClientPutInServer, true);
7.67 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect, false);
7.68 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, serverClients, this, &PlayerManager::OnClientDisconnect_Post, true);
7.69 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientCommand, serverClients, this, &PlayerManager::OnClientCommand, false);
7.70 + SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientSettingsChanged, serverClients, this, &PlayerManager::OnClientSettingsChanged, true);
7.71 + SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, ServerActivate, gamedll, this, &PlayerManager::OnServerActivate, true);
7.72
7.73 /* Release forwards */
7.74 g_Forwards.ReleaseForward(m_clconnect);
7.75 @@ -84,7 +84,7 @@
7.76 delete [] m_Players;
7.77 }
7.78
7.79 -void CPlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
7.80 +void PlayerManager::OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
7.81 {
7.82 if (m_FirstPass)
7.83 {
7.84 @@ -99,7 +99,7 @@
7.85 }
7.86 }
7.87
7.88 -void CPlayerManager::RunAuthChecks()
7.89 +void PlayerManager::RunAuthChecks()
7.90 {
7.91 CPlayer *pPlayer;
7.92 const char *authstr;
7.93 @@ -168,7 +168,7 @@
7.94 }
7.95 }
7.96
7.97 -bool CPlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen)
7.98 +bool PlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen)
7.99 {
7.100 int client = engine->IndexOfEdict(pEntity);
7.101
7.102 @@ -202,7 +202,7 @@
7.103 return true;
7.104 }
7.105
7.106 -bool CPlayerManager::OnClientConnect_Post(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen)
7.107 +bool PlayerManager::OnClientConnect_Post(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen)
7.108 {
7.109 int client = engine->IndexOfEdict(pEntity);
7.110 bool orig_value = META_RESULT_ORIG_RET(bool);
7.111 @@ -220,7 +220,7 @@
7.112 return true;
7.113 }
7.114
7.115 -void CPlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername)
7.116 +void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername)
7.117 {
7.118 cell_t res;
7.119 int client = engine->IndexOfEdict(pEntity);
7.120 @@ -258,7 +258,7 @@
7.121 m_clputinserver->Execute(&res, NULL);
7.122 }
7.123
7.124 -void CPlayerManager::OnClientDisconnect(edict_t *pEntity)
7.125 +void PlayerManager::OnClientDisconnect(edict_t *pEntity)
7.126 {
7.127 cell_t res;
7.128 int client = engine->IndexOfEdict(pEntity);
7.129 @@ -306,7 +306,7 @@
7.130 m_Players[client].Disconnect();
7.131 }
7.132
7.133 -void CPlayerManager::OnClientDisconnect_Post(edict_t *pEntity)
7.134 +void PlayerManager::OnClientDisconnect_Post(edict_t *pEntity)
7.135 {
7.136 cell_t res;
7.137 int client = engine->IndexOfEdict(pEntity);
7.138 @@ -323,7 +323,7 @@
7.139 }
7.140 }
7.141
7.142 -void CPlayerManager::OnClientCommand(edict_t *pEntity)
7.143 +void PlayerManager::OnClientCommand(edict_t *pEntity)
7.144 {
7.145 cell_t res = Pl_Continue;
7.146 int client = engine->IndexOfEdict(pEntity);
7.147 @@ -347,7 +347,7 @@
7.148 }
7.149 }
7.150
7.151 -void CPlayerManager::OnClientSettingsChanged(edict_t *pEntity)
7.152 +void PlayerManager::OnClientSettingsChanged(edict_t *pEntity)
7.153 {
7.154 cell_t res;
7.155 int client = engine->IndexOfEdict(pEntity);
7.156 @@ -357,12 +357,12 @@
7.157 m_Players[client].SetName(engine->GetClientConVarValue(client, "name"));
7.158 }
7.159
7.160 -int CPlayerManager::GetMaxClients()
7.161 +int PlayerManager::GetMaxClients()
7.162 {
7.163 return m_maxClients;
7.164 }
7.165
7.166 -CPlayer *CPlayerManager::GetPlayerByIndex(int client) const
7.167 +CPlayer *PlayerManager::GetPlayerByIndex(int client) const
7.168 {
7.169 if (client > m_maxClients || client < 1)
7.170 {
7.171 @@ -371,33 +371,33 @@
7.172 return &m_Players[client];
7.173 }
7.174
7.175 -int CPlayerManager::GetNumPlayers()
7.176 +int PlayerManager::GetNumPlayers()
7.177 {
7.178 return m_PlayerCount;
7.179 }
7.180
7.181 -void CPlayerManager::AddClientListener(IClientListener *listener)
7.182 +void PlayerManager::AddClientListener(IClientListener *listener)
7.183 {
7.184 m_hooks.push_back(listener);
7.185 }
7.186
7.187 -void CPlayerManager::RemoveClientListener(IClientListener *listener)
7.188 +void PlayerManager::RemoveClientListener(IClientListener *listener)
7.189 {
7.190 m_hooks.remove(listener);
7.191 }
7.192
7.193 -IGamePlayer *CPlayerManager::GetGamePlayer(edict_t *pEdict)
7.194 +IGamePlayer *PlayerManager::GetGamePlayer(edict_t *pEdict)
7.195 {
7.196 int index = engine->IndexOfEdict(pEdict);
7.197 return GetGamePlayer(index);
7.198 }
7.199
7.200 -IGamePlayer *CPlayerManager::GetGamePlayer(int client)
7.201 +IGamePlayer *PlayerManager::GetGamePlayer(int client)
7.202 {
7.203 return GetPlayerByIndex(client);
7.204 }
7.205
7.206 -void CPlayerManager::ClearAdminId(AdminId id)
7.207 +void PlayerManager::ClearAdminId(AdminId id)
7.208 {
7.209 for (int i=1; i<=m_maxClients; i++)
7.210 {
7.211 @@ -408,7 +408,7 @@
7.212 }
7.213 }
7.214
7.215 -void CPlayerManager::ClearAllAdmins()
7.216 +void PlayerManager::ClearAllAdmins()
7.217 {
7.218 for (int i=1; i<=m_maxClients; i++)
7.219 {
8.1 --- a/core/PlayerManager.h Thu Mar 15 04:34:42 2007 +0000
8.2 +++ b/core/PlayerManager.h Thu Mar 15 04:45:17 2007 +0000
8.3 @@ -28,7 +28,7 @@
8.4
8.5 class CPlayer : public IGamePlayer
8.6 {
8.7 - friend class CPlayerManager;
8.8 + friend class PlayerManager;
8.9 public:
8.10 CPlayer();
8.11 public:
8.12 @@ -61,13 +61,13 @@
8.13 edict_t *m_pEdict;
8.14 };
8.15
8.16 -class CPlayerManager :
8.17 +class PlayerManager :
8.18 public SMGlobalClass,
8.19 public IPlayerManager
8.20 {
8.21 public:
8.22 - CPlayerManager();
8.23 - ~CPlayerManager();
8.24 + PlayerManager();
8.25 + ~PlayerManager();
8.26 public: //SMGlobalClass
8.27 void OnSourceModAllInitialized();
8.28 void OnSourceModShutdown();
8.29 @@ -118,6 +118,6 @@
8.30 unsigned int *m_AuthQueue;
8.31 };
8.32
8.33 -extern CPlayerManager g_Players;
8.34 +extern PlayerManager g_Players;
8.35
8.36 #endif //_INCLUDE_SOURCEMOD_CPLAYERMANAGER_H_
9.1 --- a/core/TextParsers.cpp Thu Mar 15 04:34:42 2007 +0000
9.2 +++ b/core/TextParsers.cpp Thu Mar 15 04:45:17 2007 +0000
9.3 @@ -20,12 +20,12 @@
9.4 #include "TextParsers.h"
9.5 #include "ShareSys.h"
9.6
9.7 -CTextParsers g_TextParser;
9.8 +TextParsers g_TextParser;
9.9
9.10 static int g_ini_chartable1[255] = {0};
9.11 static int g_ws_chartable[255] = {0};
9.12
9.13 -CTextParsers::CTextParsers()
9.14 +TextParsers::TextParsers()
9.15 {
9.16 g_ini_chartable1[(unsigned)'_'] = 1;
9.17 g_ini_chartable1[(unsigned)'-'] = 1;
9.18 @@ -43,12 +43,12 @@
9.19 g_ws_chartable[(unsigned)' '] = 1;
9.20 }
9.21
9.22 -void CTextParsers::OnSourceModAllInitialized()
9.23 +void TextParsers::OnSourceModAllInitialized()
9.24 {
9.25 g_ShareSys.AddInterface(NULL, this);
9.26 }
9.27
9.28 -unsigned int CTextParsers::GetUTF8CharBytes(const char *stream)
9.29 +unsigned int TextParsers::GetUTF8CharBytes(const char *stream)
9.30 {
9.31 return _GetUTF8CharBytes(stream);
9.32 }
9.33 @@ -83,7 +83,7 @@
9.34 return true;
9.35 }
9.36
9.37 -SMCParseError CTextParsers::ParseString_SMC(const char *stream,
9.38 +SMCParseError TextParsers::ParseString_SMC(const char *stream,
9.39 ITextListener_SMC *smc,
9.40 unsigned int *line,
9.41 unsigned int *col)
9.42 @@ -111,7 +111,7 @@
9.43 return (ferror((FILE *)stream) == 0);
9.44 }
9.45
9.46 -SMCParseError CTextParsers::ParseFile_SMC(const char *file, ITextListener_SMC *smc, unsigned int *line, unsigned int *col)
9.47 +SMCParseError TextParsers::ParseFile_SMC(const char *file, ITextListener_SMC *smc, unsigned int *line, unsigned int *col)
9.48 {
9.49 FILE *fp = fopen(file, "rt");
9.50
9.51 @@ -220,7 +220,7 @@
9.52 return NULL;
9.53 }
9.54
9.55 -SMCParseError CTextParsers::ParseStream_SMC(void *stream,
9.56 +SMCParseError TextParsers::ParseStream_SMC(void *stream,
9.57 STREAMREADER srdr,
9.58 ITextListener_SMC *smc,
9.59 unsigned int *line,
9.60 @@ -620,7 +620,7 @@
9.61 * INI parser
9.62 */
9.63
9.64 -bool CTextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listener, unsigned int *line, unsigned int *col)
9.65 +bool TextParsers::ParseFile_INI(const char *file, ITextListener_INI *ini_listener, unsigned int *line, unsigned int *col)
9.66 {
9.67 FILE *fp = fopen(file, "rt");
9.68 unsigned int curline = 0;
9.69 @@ -918,7 +918,7 @@
9.70 return false;
9.71 }
9.72
9.73 -const char *CTextParsers::GetSMCErrorString(SMCParseError err)
9.74 +const char *TextParsers::GetSMCErrorString(SMCParseError err)
9.75 {
9.76 static const char *s_errors[] =
9.77 {
10.1 --- a/core/TextParsers.h Thu Mar 15 04:34:42 2007 +0000
10.2 +++ b/core/TextParsers.h Thu Mar 15 04:45:17 2007 +0000
10.3 @@ -46,12 +46,12 @@
10.4 */
10.5 typedef bool (*STREAMREADER)(void *, char *, size_t, unsigned int *);
10.6
10.7 -class CTextParsers :
10.8 +class TextParsers :
10.9 public ITextParsers,
10.10 public SMGlobalClass
10.11 {
10.12 public:
10.13 - CTextParsers();
10.14 + TextParsers();
10.15 public: //SMGlobalClass
10.16 void OnSourceModAllInitialized();
10.17 public:
10.18 @@ -81,6 +81,6 @@
10.19
10.20 };
10.21
10.22 -extern CTextParsers g_TextParser;
10.23 +extern TextParsers g_TextParser;
10.24
10.25 #endif //_INCLUDE_SOURCEMOD_TEXTPARSERS_H_
11.1 --- a/core/TimerSys.cpp Thu Mar 15 04:34:42 2007 +0000
11.2 +++ b/core/TimerSys.cpp Thu Mar 15 04:45:17 2007 +0000
11.3 @@ -14,7 +14,7 @@
11.4
11.5 #include "TimerSys.h"
11.6
11.7 -CTimerSystem g_Timers;
11.8 +TimerSystem g_Timers;
11.9
11.10 void ITimer::Initialize(ITimedEvent *pCallbacks, float fInterval, float fToExec, void *pData, int flags)
11.11 {
11.12 @@ -27,12 +27,12 @@
11.13 m_KillMe = false;
11.14 }
11.15
11.16 -void CTimerSystem::OnSourceModAllInitialized()
11.17 +void TimerSystem::OnSourceModAllInitialized()
11.18 {
11.19 g_ShareSys.AddInterface(NULL, this);
11.20 }
11.21
11.22 -void CTimerSystem::RunFrame()
11.23 +void TimerSystem::RunFrame()
11.24 {
11.25 ITimer *pTimer;
11.26 TimerIter iter;
11.27 @@ -76,7 +76,7 @@
11.28 m_LastExecTime = gpGlobals->curtime;
11.29 }
11.30
11.31 -ITimer *CTimerSystem::CreateTimer(ITimedEvent *pCallbacks, float fInterval, void *pData, int flags)
11.32 +ITimer *TimerSystem::CreateTimer(ITimedEvent *pCallbacks, float fInterval, void *pData, int flags)
11.33 {
11.34 ITimer *pTimer;
11.35 TimerIter iter;
11.36 @@ -123,7 +123,7 @@
11.37 return pTimer;
11.38 }
11.39
11.40 -void CTimerSystem::FireTimerOnce(ITimer *pTimer, bool delayExec)
11.41 +void TimerSystem::FireTimerOnce(ITimer *pTimer, bool delayExec)
11.42 {
11.43 ResultType res;
11.44
11.45 @@ -156,7 +156,7 @@
11.46 }
11.47 }
11.48
11.49 -void CTimerSystem::KillTimer(ITimer *pTimer)
11.50 +void TimerSystem::KillTimer(ITimer *pTimer)
11.51 {
11.52 TimerList *pList;
11.53
11.54 @@ -180,7 +180,7 @@
11.55 m_FreeTimers.push(pTimer);
11.56 }
11.57
11.58 -void CTimerSystem::MapChange()
11.59 +void TimerSystem::MapChange()
11.60 {
11.61 ITimer *pTimer;
11.62 TimerIter iter;
12.1 --- a/core/TimerSys.h Thu Mar 15 04:34:42 2007 +0000
12.2 +++ b/core/TimerSys.h Thu Mar 15 04:45:17 2007 +0000
12.3 @@ -40,7 +40,7 @@
12.4 bool m_KillMe;
12.5 };
12.6
12.7 -class CTimerSystem :
12.8 +class TimerSystem :
12.9 public ITimerSystem,
12.10 public SMGlobalClass
12.11 {
12.12 @@ -60,6 +60,6 @@
12.13 float m_LastExecTime;
12.14 };
12.15
12.16 -extern CTimerSystem g_Timers;
12.17 +extern TimerSystem g_Timers;
12.18
12.19 #endif //_INCLUDE_SOURCEMOD_CTIMERSYS_H_
13.1 --- a/core/Translator.cpp Thu Mar 15 04:34:42 2007 +0000
13.2 +++ b/core/Translator.cpp Thu Mar 15 04:45:17 2007 +0000
13.3 @@ -21,7 +21,7 @@
13.4 #include "sm_stringutil.h"
13.5 #include "sourcemod.h"
13.6
13.7 -CTranslator g_Translator;
13.8 +Translator g_Translator;
13.9 CPhraseFile *g_pCorePhrases = NULL;
13.10
13.11 struct trans_t
13.12 @@ -39,7 +39,7 @@
13.13 unsigned int translations;
13.14 };
13.15
13.16 -CPhraseFile::CPhraseFile(CTranslator *pTranslator, const char *file)
13.17 +CPhraseFile::CPhraseFile(Translator *pTranslator, const char *file)
13.18 {
13.19 m_pStringTab = pTranslator->GetStringTable();
13.20 m_pMemory = m_pStringTab->GetMemTable();
13.21 @@ -579,13 +579,13 @@
13.22 ** MAIN TRANSLATOR CODE **
13.23 **************************/
13.24
13.25 -CTranslator::CTranslator()
13.26 +Translator::Translator()
13.27 {
13.28 m_pStringTab = new BaseStringTable(2048);
13.29 m_pLCodeLookup = sm_trie_create();
13.30 }
13.31
13.32 -CTranslator::~CTranslator()
13.33 +Translator::~Translator()
13.34 {
13.35 for (size_t i=0; i<m_Files.size(); i++)
13.36 {
13.37 @@ -602,14 +602,14 @@
13.38 delete m_pStringTab;
13.39 }
13.40
13.41 -void CTranslator::OnSourceModAllInitialized()
13.42 +void Translator::OnSourceModAllInitialized()
13.43 {
13.44 AddLanguage("en", "English");
13.45 unsigned int id = FindOrAddPhraseFile("core.cfg");
13.46 g_pCorePhrases = GetFileByIndex(id);
13.47 }
13.48
13.49 -bool CTranslator::GetLanguageByCode(const char *code, unsigned int *index)
13.50 +bool Translator::GetLanguageByCode(const char *code, unsigned int *index)
13.51 {
13.52 void *_index;
13.53
13.54 @@ -626,17 +626,17 @@
13.55 return true;
13.56 }
13.57
13.58 -unsigned int CTranslator::GetLanguageCount()
13.59 +unsigned int Translator::GetLanguageCount()
13.60 {
13.61 return (unsigned int)m_Languages.size();
13.62 }
13.63
13.64 -BaseStringTable *CTranslator::GetStringTable()
13.65 +BaseStringTable *Translator::GetStringTable()
13.66 {
13.67 return m_pStringTab;
13.68 }
13.69
13.70 -unsigned int CTranslator::FindOrAddPhraseFile(const char *phrase_file)
13.71 +unsigned int Translator::FindOrAddPhraseFile(const char *phrase_file)
13.72 {
13.73 for (size_t i=0; i<m_Files.size(); i++)
13.74 {
13.75 @@ -656,7 +656,7 @@
13.76 return idx;
13.77 }
13.78
13.79 -void CTranslator::RebuildLanguageDatabase(const char *lang_header_file)
13.80 +void Translator::RebuildLanguageDatabase(const char *lang_header_file)
13.81 {
13.82 /* Erase everything we have */
13.83 sm_trie_destroy(m_pLCodeLookup);
13.84 @@ -695,13 +695,13 @@
13.85 }
13.86 }
13.87
13.88 -void CTranslator::ReadSMC_ParseStart()
13.89 +void Translator::ReadSMC_ParseStart()
13.90 {
13.91 m_InLanguageSection = false;
13.92 m_CustomError.clear();
13.93 }
13.94
13.95 -SMCParseResult CTranslator::ReadSMC_NewSection(const char *name, bool opt_quotes)
13.96 +SMCParseResult Translator::ReadSMC_NewSection(const char *name, bool opt_quotes)
13.97 {
13.98 if (!m_InLanguageSection)
13.99 {
13.100 @@ -719,14 +719,14 @@
13.101 return SMCParse_Continue;
13.102 }
13.103
13.104 -SMCParseResult CTranslator::ReadSMC_LeavingSection()
13.105 +SMCParseResult Translator::ReadSMC_LeavingSection()
13.106 {
13.107 m_InLanguageSection = false;
13.108
13.109 return SMCParse_Continue;
13.110 }
13.111
13.112 -SMCParseResult CTranslator::ReadSMC_KeyValue(const char *key, const char *value, bool key_quotes, bool value_quotes)
13.113 +SMCParseResult Translator::ReadSMC_KeyValue(const char *key, const char *value, bool key_quotes, bool value_quotes)
13.114 {
13.115 size_t len = strlen(key);
13.116
13.117 @@ -741,7 +741,7 @@
13.118 return SMCParse_Continue;
13.119 }
13.120
13.121 -bool CTranslator::AddLanguage(const char *langcode, const char *description)
13.122 +bool Translator::AddLanguage(const char *langcode, const char *description)
13.123 {
13.124 if (sm_trie_retrieve(m_pLCodeLookup, langcode, NULL))
13.125 {
13.126 @@ -763,7 +763,7 @@
13.127 return true;
13.128 }
13.129
13.130 -CPhraseFile *CTranslator::GetFileByIndex(unsigned int index)
13.131 +CPhraseFile *Translator::GetFileByIndex(unsigned int index)
13.132 {
13.133 if (index >= m_Files.size())
13.134 {
13.135 @@ -773,7 +773,7 @@
13.136 return m_Files[index];
13.137 }
13.138
13.139 -size_t CTranslator::Translate(char *buffer, size_t maxlength, void **params, const Translation *pTrans)
13.140 +size_t Translator::Translate(char *buffer, size_t maxlength, void **params, const Translation *pTrans)
13.141 {
13.142 void *new_params[MAX_TRANSLATE_PARAMS];
13.143
13.144 @@ -786,7 +786,7 @@
13.145 return gnprintf(buffer, maxlength, pTrans->szPhrase, new_params);
13.146 }
13.147
13.148 -TransError CTranslator::CoreTrans(int client,
13.149 +TransError Translator::CoreTrans(int client,
13.150 char *buffer,
13.151 size_t maxlength,
13.152 const char *phrase,
14.1 --- a/core/Translator.h Thu Mar 15 04:34:42 2007 +0000
14.2 +++ b/core/Translator.h Thu Mar 15 04:45:17 2007 +0000
14.3 @@ -26,7 +26,7 @@
14.4 /* :TODO: write a templatized version of tries? */
14.5
14.6 using namespace SourceHook;
14.7 -class CTranslator;
14.8 +class Translator;
14.9
14.10 enum PhraseParseState
14.11 {
14.12 @@ -60,7 +60,7 @@
14.13 class CPhraseFile : public ITextListener_SMC
14.14 {
14.15 public:
14.16 - CPhraseFile(CTranslator *pTranslator, const char *file);
14.17 + CPhraseFile(Translator *pTranslator, const char *file);
14.18 ~CPhraseFile();
14.19 public:
14.20 void ReparseFile();
14.21 @@ -79,7 +79,7 @@
14.22 private:
14.23 Trie *m_pPhraseLookup;
14.24 String m_File;
14.25 - CTranslator *m_pTranslator;
14.26 + Translator *m_pTranslator;
14.27 PhraseParseState m_ParseState;
14.28 int m_CurPhrase;
14.29 BaseMemTable *m_pMemory;
14.30 @@ -91,13 +91,13 @@
14.31 bool m_FileLogged;
14.32 };
14.33
14.34 -class CTranslator :
14.35 +class Translator :
14.36 public ITextListener_SMC,
14.37 public SMGlobalClass
14.38 {
14.39 public:
14.40 - CTranslator();
14.41 - ~CTranslator();
14.42 + Translator();
14.43 + ~Translator();
14.44 public: //SMGlobalClass
14.45 void OnSourceModAllInitialized();
14.46 public: //ITextListener_SMC
14.47 @@ -131,6 +131,6 @@
14.48 };
14.49
14.50 extern CPhraseFile *g_pCorePhrases;
14.51 -extern CTranslator g_Translator;
14.52 +extern Translator g_Translator;
14.53
14.54 #endif //_INCLUDE_SOURCEMOD_TRANSLATOR_H_
15.1 --- a/core/UserMessages.cpp Thu Mar 15 04:34:42 2007 +0000
15.2 +++ b/core/UserMessages.cpp Thu Mar 15 04:45:17 2007 +0000
15.3 @@ -14,14 +14,14 @@
15.4
15.5 #include "UserMessages.h"
15.6
15.7 -CUserMessages g_UserMsgs;
15.8 +UserMessages g_UserMsgs;
15.9
15.10 SH_DECL_HOOK2(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int);
15.11 SH_DECL_HOOK0_void(IVEngineServer, MessageEnd, SH_NOATTRIB, 0);
15.12
15.13 //:TODO: USE NEW MM IFACE TO SEARCH FOR MESSAGE NAMES ETC! faluco--> i'll do this when i have some spare time
15.14
15.15 -CUserMessages::CUserMessages() : m_InterceptBuffer(m_pBase, 2500)
15.16 +UserMessages::UserMessages() : m_InterceptBuffer(m_pBase, 2500)
15.17 {
15.18 m_Names = sm_trie_create();
15.19 m_HookCount = 0;
15.20 @@ -31,29 +31,29 @@
15.21 m_CurId = INVALID_MESSAGE_ID;
15.22 }
15.23
15.24 -CUserMessages::~CUserMessages()
15.25 +UserMessages::~UserMessages()
15.26 {
15.27 sm_trie_destroy(m_Names);
15.28 }
15.29
15.30 -void CUserMessages::OnSourceModAllInitialized()
15.31 +void UserMessages::OnSourceModAllInitialized()
15.32 {
15.33 g_ShareSys.AddInterface(NULL, this);
15.34 }
15.35
15.36 -void CUserMessages::OnSourceModAllShutdown()
15.37 +void UserMessages::OnSourceModAllShutdown()
15.38 {
15.39 if (m_HookCount)
15.40 {
15.41 - SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &CUserMessages::OnStartMessage_Pre, false);
15.42 - SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &CUserMessages::OnStartMessage_Post, true);
15.43 - SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &CUserMessages::OnMessageEnd_Pre, false);
15.44 - SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &CUserMessages::OnMessageEnd_Post, true);
15.45 + SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
15.46 + SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
15.47 + SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
15.48 + SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
15.49 }
15.50 m_HookCount = 0;
15.51 }
15.52
15.53 -int CUserMessages::GetMessageIndex(const char *msg)
15.54 +int UserMessages::GetMessageIndex(const char *msg)
15.55 {
15.56 int msgid;
15.57 if (!sm_trie_retrieve(m_Names, msg, reinterpret_cast<void **>(&msgid)))
15.58 @@ -78,14 +78,14 @@
15.59 return msgid;
15.60 }
15.61
15.62 -bool CUserMessages::GetMessageName(int msgid, char *buffer, size_t maxlen) const
15.63 +bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlen) const
15.64 {
15.65 int dummy;
15.66
15.67 return gamedll->GetUserMessageInfo(msgid, buffer, maxlen, dummy);
15.68 }
15.69
15.70 -bf_write *CUserMessages::StartMessage(int msg_id, cell_t players[], unsigned int playersNum, int flags)
15.71 +bf_write *UserMessages::StartMessage(int msg_id, cell_t players[], unsigned int playersNum, int flags)
15.72 {
15.73 bf_write *buffer;
15.74
15.75 @@ -122,7 +122,7 @@
15.76 return buffer;
15.77 }
15.78
15.79 -bool CUserMessages::EndMessage()
15.80 +bool UserMessages::EndMessage()
15.81 {
15.82 if (!m_InExec)
15.83 {
15.84 @@ -143,7 +143,7 @@
15.85 return true;
15.86 }
15.87
15.88 -bool CUserMessages::HookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
15.89 +bool UserMessages::HookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
15.90 {
15.91 if (msg_id < 0 || msg_id >= 255)
15.92 {
15.93 @@ -165,10 +165,10 @@
15.94
15.95 if (!m_HookCount++)
15.96 {
15.97 - SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &CUserMessages::OnStartMessage_Pre, false);
15.98 - SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &CUserMessages::OnStartMessage_Post, true);
15.99 - SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &CUserMessages::OnMessageEnd_Pre, false);
15.100 - SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &CUserMessages::OnMessageEnd_Post, true);
15.101 + SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
15.102 + SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
15.103 + SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
15.104 + SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
15.105 }
15.106
15.107 if (intercept)
15.108 @@ -181,7 +181,7 @@
15.109 return true;
15.110 }
15.111
15.112 -bool CUserMessages::UnhookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
15.113 +bool UserMessages::UnhookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
15.114 {
15.115 MsgList *pList;
15.116 MsgIter iter;
15.117 @@ -218,18 +218,18 @@
15.118 return deleted;
15.119 }
15.120
15.121 -void CUserMessages::_DecRefCounter()
15.122 +void UserMessages::_DecRefCounter()
15.123 {
15.124 if (--m_HookCount == 0)
15.125 {
15.126 - SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &CUserMessages::OnStartMessage_Pre, false);
15.127 - SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &CUserMessages::OnStartMessage_Post, true);
15.128 - SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &CUserMessages::OnMessageEnd_Pre, false);
15.129 - SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &CUserMessages::OnMessageEnd_Post, true);
15.130 + SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
15.131 + SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
15.132 + SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
15.133 + SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
15.134 }
15.135 }
15.136
15.137 -bf_write *CUserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type)
15.138 +bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type)
15.139 {
15.140 bool is_intercept_empty = m_msgIntercepts[msg_type].empty();
15.141 bool is_hook_empty = m_msgHooks[msg_type].empty();
15.142 @@ -255,7 +255,7 @@
15.143 RETURN_META_VALUE(MRES_IGNORED, NULL);
15.144 }
15.145
15.146 -bf_write *CUserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type)
15.147 +bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type)
15.148 {
15.149 if (!m_InHook)
15.150 {
15.151 @@ -267,7 +267,7 @@
15.152 RETURN_META_VALUE(MRES_IGNORED, NULL);
15.153 }
15.154
15.155 -void CUserMessages::OnMessageEnd_Post()
15.156 +void UserMessages::OnMessageEnd_Post()
15.157 {
15.158 if (!m_InHook || m_BlockEndPost)
15.159 {
15.160 @@ -319,7 +319,7 @@
15.161 m_InHook = false;
15.162 }
15.163
15.164 -void CUserMessages::OnMessageEnd_Pre()
15.165 +void UserMessages::OnMessageEnd_Pre()
15.166 {
15.167 if (!m_InHook)
15.168 {
16.1 --- a/core/UserMessages.h Thu Mar 15 04:34:42 2007 +0000
16.2 +++ b/core/UserMessages.h Thu Mar 15 04:45:17 2007 +0000
16.3 @@ -36,13 +36,13 @@
16.4 typedef List<ListenerInfo *> MsgList;
16.5 typedef List<ListenerInfo *>::iterator MsgIter;
16.6
16.7 -class CUserMessages :
16.8 +class UserMessages :
16.9 public IUserMessages,
16.10 public SMGlobalClass
16.11 {
16.12 public:
16.13 - CUserMessages();
16.14 - ~CUserMessages();
16.15 + UserMessages();
16.16 + ~UserMessages();
16.17 public: //SMGlobalClass
16.18 void OnSourceModAllInitialized();
16.19 void OnSourceModAllShutdown();
16.20 @@ -80,6 +80,6 @@
16.21 int m_CurId;
16.22 };
16.23
16.24 -extern CUserMessages g_UserMsgs;
16.25 +extern UserMessages g_UserMsgs;
16.26
16.27 #endif //_INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
