games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Use vstd::contains

Browse Source
This commit is contained in:
Tomasz Zieliński
2025-03-14 20:14:57 +01:00
parent d94b2f05eb
commit 5d410a4243
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/rmg/CZonePlacer.cpp
View File

@@ -1100,14 +1100,14 @@ void CZonePlacer::dropRandomRoads(vstd::RNG * rand)
auto current = stack.top(); auto current = stack.top();
stack.pop(); stack.pop();
if(visited.find(current) != visited.end()) if(vstd::contains(visited, current))
continue; continue;
visited.insert(current); visited.insert(current);
for(auto & neighbor : roadGraph[current]) for(auto & neighbor : roadGraph[current])
{ {
if(visited.find(neighbor.first) == visited.end()) if(!vstd::contains(visited, neighbor.first))
{ {
stack.push(neighbor.first); stack.push(neighbor.first);
} }
@@ -1117,7 +1117,7 @@ void CZonePlacer::dropRandomRoads(vstd::RNG * rand)
//Check if all zones with roads are still reachable //Check if all zones with roads are still reachable
for(auto zoneId : zonesWithRoads) for(auto zoneId : zonesWithRoads)
{ {
if(visited.find(zoneId) == visited.end()) if(!vstd::contains(visited, zoneId))
{ {
canRemove = false; canRemove = false;
break; break;
@@ -1128,7 +1128,7 @@ void CZonePlacer::dropRandomRoads(vstd::RNG * rand)
if(!canRemove) if(!canRemove)
{ {
//Restore connection and try next one //Restore connection and try next one
if(roadGraph[zoneA].find(zoneB) == roadGraph[zoneA].end()) if(!vstd::contains(roadGraph[zoneA], zoneB))
{ {
roadGraph[zoneA][zoneB] = 1; roadGraph[zoneA][zoneB] = 1;
roadGraph[zoneB][zoneA] = 1; roadGraph[zoneB][zoneA] = 1;