diff options
author | rubidium42 <rubidium@openttd.org> | 2021-05-06 16:19:00 +0200 |
---|---|---|
committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-06 21:45:36 +0200 |
commit | f1dfa661a1898cde06a38ab4cb230c95912b245b (patch) | |
tree | b2ae2f662689bbee7de8c8ae3aa3f36ed354e3a1 /src/network/network_gui.cpp | |
parent | cb89d22cf248841f93d257983770a08aa0a64561 (diff) | |
download | openttd-f1dfa661a1898cde06a38ab4cb230c95912b245b.tar.xz |
Codechange: [Network] Use std::string for NetworkGameInfo
Diffstat (limited to 'src/network/network_gui.cpp')
-rw-r--r-- | src/network/network_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 526f141cd..cf16d06b1 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -271,7 +271,7 @@ protected: /** Sort servers by name. */ static bool NGameNameSorter(NetworkGameList * const &a, NetworkGameList * const &b) { - int r = strnatcmp(a->info.server_name, b->info.server_name, true); // Sort by name (natural sorting). + int r = strnatcmp(a->info.server_name.c_str(), b->info.server_name.c_str(), true); // Sort by name (natural sorting). if (r == 0) r = a->connection_string.compare(b->connection_string); return r < 0; @@ -324,7 +324,7 @@ protected: static bool NGameAllowedSorter(NetworkGameList * const &a, NetworkGameList * const &b) { /* The servers we do not know anything about (the ones that did not reply) should be at the bottom) */ - int r = StrEmpty(a->info.server_revision) - StrEmpty(b->info.server_revision); + int r = a->info.server_revision.empty() - b->info.server_revision.empty(); /* Reverse default as we are interested in version-compatible clients first */ if (r == 0) r = b->info.version_compatible - a->info.version_compatible; @@ -361,7 +361,7 @@ protected: assert((*item) != nullptr); sf.ResetState(); - sf.AddLine((*item)->info.server_name); + sf.AddLine((*item)->info.server_name.c_str()); return sf.GetState(); } |