Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

changed pointers to references

Browse Source
This commit is contained in:
Jari van der Kaap 2023-04-16 13:47:31 +02:00
parent 764db3afea
commit f68c8269e3
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/component/server_list.cpp
View File

@ -175,9 +175,9 @@ namespace server_list
write_favorite_servers(); write_favorite_servers();
} }
std::unordered_set<game::netadr_t>* get_favorite_servers() std::unordered_set<game::netadr_t>& get_favorite_servers()
{ {
return &favorite_servers; return favorite_servers;
} }
struct component final : client_component struct component final : client_component

2
src/client/component/server_list.hpp
View File

@ -10,5 +10,5 @@ namespace server_list
void add_favorite_server(game::netadr_t addr); void add_favorite_server(game::netadr_t addr);
void remove_favorite_server(game::netadr_t addr); void remove_favorite_server(game::netadr_t addr);
std::unordered_set<game::netadr_t>* get_favorite_servers(); std::unordered_set<game::netadr_t>& get_favorite_servers();
} }

20
src/client/steam/interfaces/matchmaking_servers.cpp
View File

@ -74,12 +74,12 @@ namespace steam
} }
void handle_server_respone(const bool success, const game::netadr_t& host, const ::utils::info_string& info, void handle_server_respone(const bool success, const game::netadr_t& host, const ::utils::info_string& info,
const uint32_t ping, ::utils::concurrency::container<servers>* server_list, const uint32_t ping, ::utils::concurrency::container<servers>& server_list,
std::atomic<matchmaking_server_list_response*>* response, void* request) std::atomic<matchmaking_server_list_response*>& response, void* request)
{ {
bool all_handled = false; bool all_handled = false;
std::optional<int> index{}; std::optional<int> index{};
server_list->access([&](servers& srvs) server_list.access([&](servers& srvs)
{ {
size_t i = 0; size_t i = 0;
for (; i < srvs.size(); ++i) for (; i < srvs.size(); ++i)
@ -113,7 +113,7 @@ namespace steam
all_handled = true; all_handled = true;
}); });
const auto res = response->load(); const auto res = response.load();
if (!index || !res) if (!index || !res)
{ {
return; return;
@ -137,14 +137,14 @@ namespace steam
void handle_internet_server_response(const bool success, const game::netadr_t& host, const ::utils::info_string& info, void handle_internet_server_response(const bool success, const game::netadr_t& host, const ::utils::info_string& info,
const uint32_t ping) const uint32_t ping)
{ {
handle_server_respone(success, host, info, ping, &internet_servers, &internet_response, internet_request); handle_server_respone(success, host, info, ping, internet_servers, internet_response, internet_request);
} }
void handle_favorites_server_response(const bool success, const game::netadr_t& host, const ::utils::info_string& info, void handle_favorites_server_response(const bool success, const game::netadr_t& host, const ::utils::info_string& info,
const uint32_t ping) const uint32_t ping)
{ {
handle_server_respone(success, host, info, ping, &favorites_servers, &favorites_response, favorites_request); handle_server_respone(success, host, info, ping, favorites_servers, favorites_response, favorites_request);
} }
void ping_server(const game::netadr_t& server, party::query_callback callback) void ping_server(const game::netadr_t& server, party::query_callback callback)
@ -227,7 +227,7 @@ namespace steam
auto s = server_list::get_favorite_servers(); auto s = server_list::get_favorite_servers();
if (s->empty()) if (s.empty())
{ {
res->RefreshComplete(favorites_request, eNoServersListedOnMasterServer); res->RefreshComplete(favorites_request, eNoServersListedOnMasterServer);
return favorites_request; return favorites_request;
@ -236,9 +236,9 @@ namespace steam
favorites_servers.access([s](servers& srvs) favorites_servers.access([s](servers& srvs)
{ {
srvs = {}; srvs = {};
srvs.reserve(s->size()); srvs.reserve(s.size());
for (auto& address : *s) for (auto& address : s)
{ {
server new_server{}; server new_server{};
new_server.address = address; new_server.address = address;
@ -248,7 +248,7 @@ namespace steam
} }
}); });
for (auto& srv : *s) for (auto& srv : s)
{ {
ping_server(srv, handle_favorites_server_response); ping_server(srv, handle_favorites_server_response);
} }