diff options
| author | Patric Stout <truebrain@openttd.org> | 2021-08-10 20:03:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-10 20:03:13 +0200 |
| commit | 4c1ea4020d797e2ddb086cc73109eb8c51cbbbdb (patch) | |
| tree | bc8b65fe81b89f8d73e3dcd27ad458fcc0f35ffd /src/console_cmds.cpp | |
| parent | 8a083cd7f81d8223f08c30d5bcb2d9c38e7556a4 (diff) | |
| download | openttd-4c1ea4020d797e2ddb086cc73109eb8c51cbbbdb.tar.xz | |
Change: remove the ability to control "max spectators" (#9466)
Soon we will make "join game" join the game as spectator first,
so limiting the amount of spectators makes no sense anymore in
that context. Not sure it ever did make sense.
Diffstat (limited to 'src/console_cmds.cpp')
| -rw-r--r-- | src/console_cmds.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index fd7f09e3c..8963c4751 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -698,14 +698,14 @@ DEF_CONSOLE_CMD(ConServerInfo) { if (argc == 0) { IConsolePrint(CC_HELP, "List current and maximum client/company limits. Usage 'server_info'."); - IConsolePrint(CC_HELP, "You can change these values by modifying settings 'network.max_clients', 'network.max_companies' and 'network.max_spectators'."); + IConsolePrint(CC_HELP, "You can change these values by modifying settings 'network.max_clients' and 'network.max_companies'."); return true; } IConsolePrint(CC_DEFAULT, "Invite code: {}", _network_server_invite_code); IConsolePrint(CC_DEFAULT, "Current/maximum clients: {:3d}/{:3d}", _network_game_info.clients_on, _settings_client.network.max_clients); IConsolePrint(CC_DEFAULT, "Current/maximum companies: {:3d}/{:3d}", Company::GetNumItems(), _settings_client.network.max_companies); - IConsolePrint(CC_DEFAULT, "Current/maximum spectators: {:3d}/{:3d}", NetworkSpectatorCount(), _settings_client.network.max_spectators); + IConsolePrint(CC_DEFAULT, "Current spectators: {:3d}", NetworkSpectatorCount()); return true; } @@ -765,11 +765,6 @@ DEF_CONSOLE_CMD(ConJoinCompany) return true; } - if (company_id == COMPANY_SPECTATOR && NetworkMaxSpectatorsReached()) { - IConsolePrint(CC_ERROR, "Cannot join spectators, maximum number of spectators reached."); - return true; - } - if (company_id != COMPANY_SPECTATOR && !Company::IsHumanID(company_id)) { IConsolePrint(CC_ERROR, "Cannot join AI company."); return true; @@ -2422,7 +2417,6 @@ void IConsoleStdLibRegister() IConsole::AliasRegister("server_port", "setting server_port %+"); IConsole::AliasRegister("max_clients", "setting max_clients %+"); IConsole::AliasRegister("max_companies", "setting max_companies %+"); - IConsole::AliasRegister("max_spectators", "setting max_spectators %+"); IConsole::AliasRegister("max_join_time", "setting max_join_time %+"); IConsole::AliasRegister("pause_on_join", "setting pause_on_join %+"); IConsole::AliasRegister("autoclean_companies", "setting autoclean_companies %+"); |