diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2012-08-17 00:03:53 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2013-02-24 17:54:29 +0100 |
| commit | 98042012a6c6e639c9736b32518dd082ca539615 (patch) | |
| tree | 069cdf4a2149dde7c5efcce1df56942f89bc3365 /src/engine/server/server.cpp | |
| parent | 6af382ade1d350091545dd24ab79020bda7825f2 (diff) | |
| download | zcatch-98042012a6c6e639c9736b32518dd082ca539615.tar.gz zcatch-98042012a6c6e639c9736b32518dd082ca539615.zip | |
cleaned up warnings that clang spits out. some bugs found with it.
Conflicts: src/game/server/gamemodes/ctf.cpp src/game/server/gamemodes/ctf.h
Diffstat (limited to 'src/engine/server/server.cpp')
| -rw-r--r-- | src/engine/server/server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 3cad5d1c..4b7f6332 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -145,7 +145,7 @@ void CSnapIDPool::FreeID(int ID) } -void CServerBan::Init(IConsole *pConsole, IStorage *pStorage, CServer* pServer) +void CServerBan::InitServerBan(IConsole *pConsole, IStorage *pStorage, CServer* pServer) { CNetBan::Init(pConsole, pStorage); @@ -1618,7 +1618,7 @@ void CServer::RegisterCommands() Console()->Chain("console_output_level", ConchainConsoleOutputLevelUpdate, this); // register console commands in sub parts - m_ServerBan.Init(Console(), Storage(), this); + m_ServerBan.InitServerBan(Console(), Storage(), this); m_pGameServer->OnConsoleInit(); } |