diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/server.h | 2 | ||||
| -rw-r--r-- | src/engine/server/server.cpp | 8 | ||||
| -rw-r--r-- | src/engine/server/server.h | 3 | ||||
| -rw-r--r-- | src/engine/shared/network.h | 1 | ||||
| -rw-r--r-- | src/engine/shared/network_server.cpp | 1 |
5 files changed, 11 insertions, 4 deletions
diff --git a/src/engine/server.h b/src/engine/server.h index 5036b654..deb36ef5 100644 --- a/src/engine/server.h +++ b/src/engine/server.h @@ -66,6 +66,8 @@ public: virtual void DemoRecorder_HandleAutoStart() = 0; virtual bool DemoRecorder_IsRecording() = 0; + //zCatch + virtual void MapReload() = 0; }; class IGameServer : public IInterface diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 3a652d68..4a03be16 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1368,7 +1368,7 @@ int CServer::Run() m_Econ.Init(Console(), &m_ServerBan); Console()->ExecuteFile(SERVER_BANMASTERFILE); - + char aBuf[256]; str_format(aBuf, sizeof(aBuf), "server name is '%s'", g_Config.m_SvName); Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf); @@ -1575,6 +1575,11 @@ void CServer::DemoRecorder_HandleAutoStart() } } +void CServer::MapReload() +{ + m_MapReload = 1; +} + bool CServer::DemoRecorder_IsRecording() { return m_DemoRecorder.IsRecording(); @@ -1606,7 +1611,6 @@ void CServer::ConMapReload(IConsole::IResult *pResult, void *pUser) ((CServer *)pUser)->m_MapReload = 1; } - void CServer::ConAddBanmaster(IConsole::IResult *pResult, void *pUser) { CServer *pServer = (CServer *)pUser; diff --git a/src/engine/server/server.h b/src/engine/server/server.h index 731ab1b9..9f62ab37 100644 --- a/src/engine/server/server.h +++ b/src/engine/server/server.h @@ -241,6 +241,9 @@ public: virtual void SnapFreeID(int ID); virtual void *SnapNewItem(int Type, int ID, int Size); void SnapSetStaticsize(int ItemType, int Size); + + //zCatch + virtual void MapReload(); }; #endif diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h index d4418097..b607b4d4 100644 --- a/src/engine/shared/network.h +++ b/src/engine/shared/network.h @@ -242,7 +242,6 @@ public: // server side class CNetServer { -public: struct CSlot { public: diff --git a/src/engine/shared/network_server.cpp b/src/engine/shared/network_server.cpp index 6818c0f0..f1190223 100644 --- a/src/engine/shared/network_server.cpp +++ b/src/engine/shared/network_server.cpp @@ -292,7 +292,6 @@ int CNetServer::CBanmaster::Add(const char *pAddrStr) return 3; m_aBanmasters[m_NumBanmasters] = Addr; - m_NumBanmasters++; return 0; } |