cpp/openttd-patchpack/source Changeset - r17923:55051a786f80

Changeset - r17923:55051a786f80

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 13 years ago 2011-08-13 08:32:55
frosch@openttd.org

(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.

3 files changed with 4 insertions and 4 deletions:

src/console_cmds.cpp

src/network/network.cpp

src/network/network_func.h

0 comments (0 inline, 0 general)

src/console_cmds.cpp

➞

Show inline comments

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

src/network/network.cpp

➞

Show inline comments

@@ @@ -158,12 +158,12 @@ byte NetworkSpectatorCount() @@
  * @param password The unhashed password we like to set ('*' or '' resets 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 (_network_server) {
-		NetworkServerSetCompanyPassword(company_id, password, already_hashed);
+		NetworkServerSetCompanyPassword(company_id, password, false);
 	} else {
 		NetworkClientSetCompanyPassword(password);
+	}

src/network/network_func.h

➞

Show inline comments

@@ @@ -36,7 +36,7 @@ extern StringList _network_ban_list; @@
 byte NetworkSpectatorCount();
 void NetworkUpdateClientName();
 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 NetworkDisconnect(bool blocking = false, bool close_admins = true);
 void NetworkGameLoop();

0 comments (0 inline, 0 general)