mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-15 08:22:34 +01:00
Code Issues Releases Wiki Activity

Cleanup: remove client side password checks when moving to a different company

Browse Source
This commit is contained in:
Rubidium
2024-03-23 19:26:08 +01:00
committed by rubidium42
parent 16639939e9
commit 9dc1fdc385
5 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/console_cmds.cpp
View File

@@ -914,7 +914,7 @@ DEF_CONSOLE_CMD(ConClientNickChange)
DEF_CONSOLE_CMD(ConJoinCompany)
{
if (argc < 2) {
IConsolePrint(CC_HELP, "Request joining another company. Usage: 'join <company-id> [<password>]'.");
IConsolePrint(CC_HELP, "Request joining another company. Usage: 'join <company-id>'.");
IConsolePrint(CC_HELP, "For valid company-id see company list, use 255 for spectator.");
return true;
}
@@ -943,9 +943,8 @@ DEF_CONSOLE_CMD(ConJoinCompany)
return true;
}
/* Check if the company requires a password */
if (NetworkCompanyIsPassworded(company_id) && argc < 3) {
IConsolePrint(CC_ERROR, "Company {} requires a password to join.", company_id + 1);
if (!info->CanJoinCompany(company_id)) {
IConsolePrint(CC_ERROR, "You are not allowed to join this company.");
return true;
}
@@ -953,7 +952,7 @@ DEF_CONSOLE_CMD(ConJoinCompany)
if (_network_server) {
NetworkServerDoMove(CLIENT_ID_SERVER, company_id);
} else {
NetworkClientRequestMove(company_id, NetworkCompanyIsPassworded(company_id) ? argv[2] : "");
NetworkClientRequestMove(company_id);
}
return true;