summaryrefslogtreecommitdiff
path: root/src/network/network_server.cpp
diff options
context:
space:
mode:
authorrubidium42 <rubidium@openttd.org>2021-05-30 13:36:07 +0200
committerrubidium42 <rubidium42@users.noreply.github.com>2021-06-10 21:53:19 +0200
commitbb8fd007605c17c4f96fdda75e3d2780b8944faf (patch)
treee2773a80f572ae78427768527e30e93448cb2c22 /src/network/network_server.cpp
parentab9b937ab7a80562b88d72ec17c6b2a6b3ed2b61 (diff)
downloadopenttd-bb8fd007605c17c4f96fdda75e3d2780b8944faf.tar.xz
Cleanup: [Network] Remove C-string Recv_string and its last use
Diffstat (limited to 'src/network/network_server.cpp')
-rw-r--r--src/network/network_server.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 5b1da8fa2..9b9dc6fc9 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -874,13 +874,11 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_JOIN(Packet *p)
return this->SendError(NETWORK_ERROR_NOT_EXPECTED);
}
- char client_revision[NETWORK_REVISION_LENGTH];
-
- p->Recv_string(client_revision, sizeof(client_revision));
+ std::string client_revision = p->Recv_string(NETWORK_REVISION_LENGTH);
uint32 newgrf_version = p->Recv_uint32();
/* Check if the client has revision control enabled */
- if (!IsNetworkCompatibleVersion(client_revision) || _openttd_newgrf_version != newgrf_version) {
+ if (!IsNetworkCompatibleVersion(client_revision.c_str()) || _openttd_newgrf_version != newgrf_version) {
/* Different revisions!! */
return this->SendError(NETWORK_ERROR_WRONG_REVISION);
}