gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-11 16:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22738) -Fix [FS#4722] (r21854): Setting company passwords via the GUI on servers (including starting a company with the default password) failed, so no client could join.

Browse Source
This commit is contained in:
frosch 2011-08-13 08:32:55 +00:00
parent 81074e0ca2
commit 6bb33acc0d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/console_cmds.cpp
View File

@ -1640,7 +1640,7 @@ DEF_CONSOLE_CMD(ConCompanyPassword)
return false; return false;
} }
password = NetworkChangeCompanyPassword(company_id, password, false); password = NetworkChangeCompanyPassword(company_id, password);
if (StrEmpty(password)) { if (StrEmpty(password)) {
IConsolePrintF(CC_WARNING, "Company password cleared"); IConsolePrintF(CC_WARNING, "Company password cleared");

4
src/network/network.cpp
View File

@ -158,12 +158,12 @@ byte NetworkSpectatorCount()
* @param password The unhashed password we like to set ('*' or '' resets the password) * @param password The unhashed password we like to set ('*' or '' resets the password)
* @return The password. * @return The password.
*/ */
const char *NetworkChangeCompanyPassword(CompanyID company_id, const char *password, bool already_hashed) const char *NetworkChangeCompanyPassword(CompanyID company_id, const char *password)
{ {
if (strcmp(password, "*") == 0) password = ""; if (strcmp(password, "*") == 0) password = "";
if (_network_server) { if (_network_server) {
NetworkServerSetCompanyPassword(company_id, password, already_hashed); NetworkServerSetCompanyPassword(company_id, password, false);
} else { } else {
NetworkClientSetCompanyPassword(password); NetworkClientSetCompanyPassword(password);
} }

2
src/network/network_func.h
View File

@ -36,7 +36,7 @@ extern StringList _network_ban_list;
byte NetworkSpectatorCount(); byte NetworkSpectatorCount();
void NetworkUpdateClientName(); void NetworkUpdateClientName();
bool NetworkCompanyHasClients(CompanyID company); bool NetworkCompanyHasClients(CompanyID company);
const char *NetworkChangeCompanyPassword(CompanyID company_id, const char *password, bool already_hashed = true); const char *NetworkChangeCompanyPassword(CompanyID company_id, const char *password);
void NetworkReboot(); void NetworkReboot();
void NetworkDisconnect(bool blocking = false, bool close_admins = true); void NetworkDisconnect(bool blocking = false, bool close_admins = true);
void NetworkGameLoop(); void NetworkGameLoop();