cpp/openttd-patchpack/source File Diff

File diff r26939:611bacb07259 → r26940:92b381a46f34

src/network/network_client.cpp

➞

Show inline comments

@@ @@ -1111,6 +1111,7 @@ NetworkRecvStatus ClientNetworkGameSocke @@
 	_network_server_max_companies = p->Recv_uint8();
 	_network_server_name = p->Recv_string(NETWORK_NAME_LENGTH);
 	SetWindowClassesDirty(WC_CLIENT_LIST);
 	return NETWORK_RECV_STATUS_OKAY;
+}
@@ @@ -1320,10 +1321,19 @@ bool NetworkClientPreferTeamChat(const N @@
+}
 /**
  * Get the maximum number of companies that are allowed by the server.
  * @return The number of companies allowed.
  */
 uint NetworkMaxCompaniesAllowed()
+{
 	return _network_server ? _settings_client.network.max_companies : _network_server_max_companies;
+}
 /**
  * Check if max_companies has been reached on the server (local check only).
  * @return true if the max value has been reached or exceeded, false otherwise.
  */
 bool NetworkMaxCompaniesReached()
+{
-	return Company::GetNumItems() >= (_network_server ? _settings_client.network.max_companies : _network_server_max_companies);
+	return Company::GetNumItems() >= NetworkMaxCompaniesAllowed();
+}