about summary refs log tree commit diff
path: root/src/engine
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-12-04 16:51:33 +0100
committeroy <Tom_Adams@web.de>2011-12-04 16:51:33 +0100
commit8e0ce38e299da43e4a9f55e45b3dcd1fbe462781 (patch)
tree88330f4d59e764320a7be69e92f03a3127afaa4d /src/engine
parent9a03989e84c8d2719801889738c6af68864aba10 (diff)
downloadzcatch-8e0ce38e299da43e4a9f55e45b3dcd1fbe462781.tar.gz
zcatch-8e0ce38e299da43e4a9f55e45b3dcd1fbe462781.zip
fixed sv_max_client usage
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/server.h1
-rw-r--r--src/engine/server/server.cpp5
-rw-r--r--src/engine/server/server.h1
-rw-r--r--src/engine/shared/network.h2
4 files changed, 8 insertions, 1 deletions
diff --git a/src/engine/server.h b/src/engine/server.h
index 31134ca9..f3c9ca7c 100644
--- a/src/engine/server.h
+++ b/src/engine/server.h
@@ -25,6 +25,7 @@ public:
 	int Tick() const { return m_CurrentGameTick; }
 	int TickSpeed() const { return m_TickSpeed; }
 
+	virtual int MaxClients() const = 0;
 	virtual const char *ClientName(int ClientID) = 0;
 	virtual const char *ClientClan(int ClientID) = 0;
 	virtual int ClientCountry(int ClientID) = 0;
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index d253d3fc..a904f466 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -390,6 +390,11 @@ bool CServer::ClientIngame(int ClientID)
 	return ClientID >= 0 && ClientID < MAX_CLIENTS && m_aClients[ClientID].m_State == CServer::CClient::STATE_INGAME;
 }
 
+int CServer::MaxClients() const
+{
+	return m_NetServer.MaxClients();
+}
+
 int CServer::SendMsg(CMsgPacker *pMsg, int Flags, int ClientID)
 {
 	return SendMsgEx(pMsg, Flags, ClientID, false);
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
index 916eb37d..4c450a48 100644
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@@ -163,6 +163,7 @@ public:
 	const char *ClientClan(int ClientID);
 	int ClientCountry(int ClientID);
 	bool ClientIngame(int ClientID);
+	int MaxClients() const;
 
 	virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID);
 	int SendMsgEx(CMsgPacker *pMsg, int Flags, int ClientID, bool System);
diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h
index a9ace4e3..ca460d67 100644
--- a/src/engine/shared/network.h
+++ b/src/engine/shared/network.h
@@ -317,7 +317,7 @@ public:
 	// status requests
 	NETADDR ClientAddr(int ClientID) const { return m_aSlots[ClientID].m_Connection.PeerAddress(); }
 	NETSOCKET Socket() const { return m_Socket; }
-	int NetType() { return m_Socket.type; }
+	int NetType() const { return m_Socket.type; }
 	int MaxClients() const { return m_MaxClients; }
 
 	//