diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-05-19 13:26:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-19 13:26:15 +0200 |
commit | d8093dd27363384c7196dbff7e485f0df2b11894 (patch) | |
tree | b6bf869a55440a666f4bcc17d5e9cd93ff26dbdc /scene/multiplayer | |
parent | 71c40ff4da85a4770958533cdc65f2c9f7ddeaff (diff) | |
parent | 900c676b0282bed83d00834e3c280ac89c2bc94d (diff) |
Merge pull request #61173 from LightningAA/update-set-iterators
Diffstat (limited to 'scene/multiplayer')
-rw-r--r-- | scene/multiplayer/scene_cache_interface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/multiplayer/scene_cache_interface.cpp b/scene/multiplayer/scene_cache_interface.cpp index a7e84b6bca..7c271341db 100644 --- a/scene/multiplayer/scene_cache_interface.cpp +++ b/scene/multiplayer/scene_cache_interface.cpp @@ -214,17 +214,17 @@ bool SceneCacheInterface::send_object_cache(Object *p_obj, NodePath p_path, int } } else { // Long and painful. - for (const RBSet<int>::Element *E = multiplayer->get_connected_peers().front(); E; E = E->next()) { - if (p_peer_id < 0 && E->get() == -p_peer_id) { + for (const int &E : multiplayer->get_connected_peers()) { + if (p_peer_id < 0 && E == -p_peer_id) { continue; // Continue, excluded. } - if (p_peer_id > 0 && E->get() != p_peer_id) { + if (p_peer_id > 0 && E != p_peer_id) { continue; // Continue, not for this peer. } - HashMap<int, bool>::Iterator F = psc->confirmed_peers.find(E->get()); + HashMap<int, bool>::Iterator F = psc->confirmed_peers.find(E); if (!F) { - peers_to_add.push_back(E->get()); // Need to also be notified. + peers_to_add.push_back(E); // Need to also be notified. has_all_peers = false; } else if (!F->value) { has_all_peers = false; |