diff options
Diffstat (limited to 'src/common/Collision')
| -rw-r--r-- | src/common/Collision/Management/MMapManager.cpp | 4 | ||||
| -rw-r--r-- | src/common/Collision/Management/VMapManager2.cpp | 8 | ||||
| -rw-r--r-- | src/common/Collision/Maps/MapTree.cpp | 8 | ||||
| -rw-r--r-- | src/common/Collision/Maps/TileAssembler.cpp | 23 |
4 files changed, 19 insertions, 24 deletions
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index 953afb308df..d983a8b1d8d 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -29,8 +29,8 @@ namespace MMAP // ######################## MMapManager ######################## MMapManager::~MMapManager() { - for (MMapDataSet::iterator i = loadedMMaps.begin(); i != loadedMMaps.end(); ++i) - delete i->second; + for (std::pair<uint32 const, MMapData*>& loadedMMap : loadedMMaps) + delete loadedMMap.second; // by now we should not have maps loaded // if we had, tiles in MMapData->mmapLoadedTiles, their actual data is lost! diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index 65f01a2c244..4a8d55e5664 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -41,13 +41,13 @@ namespace VMAP VMapManager2::~VMapManager2(void) { - for (InstanceTreeMap::iterator i = iInstanceMapTrees.begin(); i != iInstanceMapTrees.end(); ++i) + for (std::pair<uint32 const, StaticMapTree*>& iInstanceMapTree : iInstanceMapTrees) { - delete i->second; + delete iInstanceMapTree.second; } - for (ModelFileMap::iterator i = iLoadedModelFiles.begin(); i != iLoadedModelFiles.end(); ++i) + for (std::pair<std::string const, ManagedModel>& iLoadedModelFile : iLoadedModelFiles) { - delete i->second.getModel(); + delete iLoadedModelFile.second.getModel(); } } diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp index fdba555554f..2e952e74d80 100644 --- a/src/common/Collision/Maps/MapTree.cpp +++ b/src/common/Collision/Maps/MapTree.cpp @@ -328,11 +328,11 @@ namespace VMAP void StaticMapTree::UnloadMap(VMapManager2* vm) { - for (loadedSpawnMap::iterator i = iLoadedSpawns.begin(); i != iLoadedSpawns.end(); ++i) + for (std::pair<uint32 const, uint32>& iLoadedSpawn : iLoadedSpawns) { - iTreeValues[i->first].setUnloaded(); - for (uint32 refCount = 0; refCount < i->second; ++refCount) - vm->releaseModelInstance(iTreeValues[i->first].name); + iTreeValues[iLoadedSpawn.first].setUnloaded(); + for (uint32 refCount = 0; refCount < iLoadedSpawn.second; ++refCount) + vm->releaseModelInstance(iTreeValues[iLoadedSpawn.first].name); } iLoadedSpawns.clear(); iLoadedTiles.clear(); diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index 97b0b3a69b5..7096e1284b1 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -185,22 +185,21 @@ namespace VMAP exportGameobjectModels(); // export objects std::cout << "\nConverting Model Files" << std::endl; - for (std::set<std::string>::iterator mfile = spawnedModelFiles.begin(); mfile != spawnedModelFiles.end(); ++mfile) + for (std::string const& spawnedModelFile : spawnedModelFiles) { - std::cout << "Converting " << *mfile << std::endl; - if (!convertRawFile(*mfile)) + std::cout << "Converting " << spawnedModelFile << std::endl; + if (!convertRawFile(spawnedModelFile)) { - std::cout << "error converting " << *mfile << std::endl; + std::cout << "error converting " << spawnedModelFile << std::endl; success = false; break; } } //cleanup: - for (MapData::iterator map_iter = mapData.begin(); map_iter != mapData.end(); ++map_iter) - { - delete map_iter->second; - } + for (std::pair<uint32 const, MapSpawns*>& map_iter : mapData) + delete map_iter.second; + return success; } @@ -393,14 +392,10 @@ namespace VMAP spawnedModelFiles.insert(model_name); AABox bounds; bool boundEmpty = true; - for (uint32 g = 0; g < raw_model.groupsArray.size(); ++g) + for (GroupModel_Raw& g : raw_model.groupsArray) { - std::vector<Vector3>& vertices = raw_model.groupsArray[g].vertexArray; - - uint32 nvectors = vertices.size(); - for (uint32 i = 0; i < nvectors; ++i) + for (Vector3& v : g.vertexArray) { - Vector3& v = vertices[i]; if (boundEmpty) bounds = AABox(v, v), boundEmpty = false; else |