Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Maps: Replace some Instanceable() checks with IsDungeon()

Browse Source
This commit is contained in:
Shauren authored and Ovahlord committed 2022-12-26 13:40:18 +01:00
1 parent 265c2fa508
commit b732521f17
5 files changed
+9 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Maps/MapManager.cpp
+4 -6
View File
@@ -293,11 +293,10 @@ uint32 MapManager::GetNumInstances()
for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
{
Map* map = itr->second;
if (!map->Instanceable())
if (!map->IsDungeon())
continue;
MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps();
for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
if (mitr->second->IsDungeon()) ret++;
ret += maps.size();
}
return ret;
}
@@ -310,12 +309,11 @@ uint32 MapManager::GetNumPlayersInInstances()
for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr)
{
Map* map = itr->second;
if (!map->Instanceable())
if (!map->IsDungeon())
continue;
MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps();
for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
if (mitr->second->IsDungeon())
ret += ((InstanceMap*)mitr->second)->GetPlayers().getSize();
ret += mitr->second->GetPlayers().getSize();
}
return ret;
}