From 10d1ef5447b94d17024dc0f4bdd1b7b017431a23 Mon Sep 17 00:00:00 2001 From: smatz Date: Fri, 22 May 2009 15:23:47 +0000 Subject: (svn r16379) -Codechange: remove GetNumTowns(), GetNumIndustries() and GetActiveCompanyCount(), use PoolItem::GetNumItems() instead --- src/network/network_server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/network/network_server.cpp') diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index e48137547..2ccd5c625 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -674,7 +674,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN) /* join another company does not affect these values */ switch (playas) { case COMPANY_NEW_COMPANY: // New company - if (ActiveCompanyCount() >= _settings_client.network.max_companies) { + if (Company::GetNumItems() >= _settings_client.network.max_companies) { SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_FULL); return; } @@ -901,7 +901,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) } /* Check if we are full - else it's possible for spectators to send a CMD_COMPANY_CTRL and the company is created regardless of max_companies! */ - if (ActiveCompanyCount() >= _settings_client.network.max_companies) { + if (Company::GetNumItems() >= _settings_client.network.max_companies) { NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_CLIENT, ci->client_id, "cannot create new company, server full", CLIENT_ID_SERVER); return; } -- cgit v1.2.3-54-g00ecf