petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Use vector/unique_ptr to manage network game information. (#13902)

Browse Source 
Replaces linked list with manual memory management.
This commit is contained in:
Peter Nelson
2025-03-27 18:48:41 +00:00
committed by GitHub
parent 0b3619ea35
commit 9feaa6b7bc
7 changed files with 60 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/network.cpp
View File

@@ -650,7 +650,7 @@ public:
{
Debug(net, 9, "Query::OnFailure(): connection_string={}", this->connection_string);
NetworkGameList *item = NetworkGameListAddItem(connection_string);
NetworkGame *item = NetworkGameListAddItem(connection_string);
item->status = NGLS_OFFLINE;
item->refreshing = false;
@@ -676,7 +676,7 @@ void NetworkQueryServer(const std::string &connection_string)
Debug(net, 9, "NetworkQueryServer(): connection_string={}", connection_string);
/* Mark the entry as refreshing, so the GUI can show the refresh is pending. */
NetworkGameList *item = NetworkGameListAddItem(connection_string);
NetworkGame *item = NetworkGameListAddItem(connection_string);
item->refreshing = true;
TCPConnecter::Create<TCPQueryConnecter>(connection_string);
@@ -691,12 +691,12 @@ void NetworkQueryServer(const std::string &connection_string)
* @param never_expire Whether the entry can expire (removed when no longer found in the public listing).
* @return The entry on the game list.
*/
NetworkGameList *NetworkAddServer(const std::string &connection_string, bool manually, bool never_expire)
NetworkGame *NetworkAddServer(const std::string &connection_string, bool manually, bool never_expire)
{
if (connection_string.empty()) return nullptr;
/* Ensure the item already exists in the list */
NetworkGameList *item = NetworkGameListAddItem(connection_string);
NetworkGame *item = NetworkGameListAddItem(connection_string);
if (item->info.server_name.empty()) {
ClearGRFConfigList(item->info.grfconfig);
item->info.server_name = connection_string;
@@ -729,14 +729,14 @@ void GetBindAddresses(NetworkAddressList *addresses, uint16_t port)
}
}
/* Generates the list of manually added hosts from NetworkGameList and
/* Generates the list of manually added hosts from NetworkGame and
* dumps them into the array _network_host_list. This array is needed
* by the function that generates the config file. */
void NetworkRebuildHostList()
{
_network_host_list.clear();
for (NetworkGameList *item = _network_game_list; item != nullptr; item = item->next) {
for (const auto &item : _network_game_list) {
if (item->manually) _network_host_list.emplace_back(item->connection_string);
}
}