diff options
author | rubidium42 <rubidium@openttd.org> | 2021-05-02 09:18:56 +0200 |
---|---|---|
committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-14 23:22:04 +0200 |
commit | 297d6e20bf0467d2a42e49bee291829ce3bb7c58 (patch) | |
tree | d428b9f170c31b1552b0365b21b916ff6ead6278 /src/network/network.cpp | |
parent | ebe32ad9129bb5846433366509728fb594f3be62 (diff) | |
download | openttd-297d6e20bf0467d2a42e49bee291829ce3bb7c58.tar.xz |
Codechange: [Network] Pass passwords as std::string to the network code
Diffstat (limited to 'src/network/network.cpp')
-rw-r--r-- | src/network/network.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/network.cpp b/src/network/network.cpp index 61baa7617..80ecfc2cd 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -152,9 +152,9 @@ 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) +std::string NetworkChangeCompanyPassword(CompanyID company_id, std::string password) { - if (strcmp(password, "*") == 0) password = ""; + if (password.compare("*") == 0) password = ""; if (_network_server) { NetworkServerSetCompanyPassword(company_id, password, false); @@ -787,7 +787,7 @@ public: * @param join_company_password The password for the company. * @return Whether the join has started. */ -bool NetworkClientConnectGame(const std::string &connection_string, CompanyID default_company, const char *join_server_password, const char *join_company_password) +bool NetworkClientConnectGame(const std::string &connection_string, CompanyID default_company, const std::string &join_server_password, const std::string &join_company_password) { CompanyID join_as = default_company; std::string resolved_connection_string = ParseGameConnectionString(connection_string, NETWORK_DEFAULT_PORT, &join_as).GetAddressAsString(false); |