aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/Collision/Management/MMapManager.cpp4
-rw-r--r--src/common/Collision/Management/VMapManager2.cpp8
-rw-r--r--src/common/Collision/Maps/MapTree.cpp8
-rw-r--r--src/common/Collision/Maps/TileAssembler.cpp23
-rw-r--r--src/common/Logging/Log.cpp4
-rw-r--r--src/common/Logging/Logger.cpp6
-rw-r--r--src/common/Utilities/EventMap.cpp12
-rw-r--r--src/common/Utilities/Util.cpp14
8 files changed, 37 insertions, 42 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
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index 39d17de1f04..77820929a66 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -322,8 +322,8 @@ void Log::outCharDump(char const* str, uint32 accountId, uint64 guid, char const
void Log::SetRealmId(uint32 id)
{
- for (auto it = appenders.begin(); it != appenders.end(); ++it)
- it->second->setRealmId(id);
+ for (std::pair<uint8 const, std::unique_ptr<Appender>>& appender : appenders)
+ appender.second->setRealmId(id);
}
void Log::Close()
diff --git a/src/common/Logging/Logger.cpp b/src/common/Logging/Logger.cpp
index 8e2927c08bd..63653770ade 100644
--- a/src/common/Logging/Logger.cpp
+++ b/src/common/Logging/Logger.cpp
@@ -54,7 +54,7 @@ void Logger::write(LogMessage* message) const
return;
}
- for (auto it = appenders.begin(); it != appenders.end(); ++it)
- if (it->second)
- it->second->write(message);
+ for (std::pair<uint8 const, Appender*> const& appender : appenders)
+ if (appender.second)
+ appender.second->write(message);
}
diff --git a/src/common/Utilities/EventMap.cpp b/src/common/Utilities/EventMap.cpp
index 5aea4dc1388..46da4000a50 100644
--- a/src/common/Utilities/EventMap.cpp
+++ b/src/common/Utilities/EventMap.cpp
@@ -135,18 +135,18 @@ uint32 EventMap::GetNextEventTime(uint32 eventId) const
if (Empty())
return 0;
- for (EventStore::const_iterator itr = _eventMap.begin(); itr != _eventMap.end(); ++itr)
- if (eventId == (itr->second & 0x0000FFFF))
- return itr->first;
+ for (std::pair<uint32 const, uint32> const& itr : _eventMap)
+ if (eventId == (itr.second & 0x0000FFFF))
+ return itr.first;
return 0;
}
uint32 EventMap::GetTimeUntilEvent(uint32 eventId) const
{
- for (EventStore::const_iterator itr = _eventMap.begin(); itr != _eventMap.end(); ++itr)
- if (eventId == (itr->second & 0x0000FFFF))
- return itr->first - _time;
+ for (std::pair<uint32 const, uint32> const& itr : _eventMap)
+ if (eventId == (itr.second & 0x0000FFFF))
+ return itr.first - _time;
return std::numeric_limits<uint32>::max();
}
diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp
index 74fdef8d0c1..30bc25e4b04 100644
--- a/src/common/Utilities/Util.cpp
+++ b/src/common/Utilities/Util.cpp
@@ -220,16 +220,16 @@ int32 MoneyStringToMoney(std::string const& moneyString)
return 0; // Bad format
Tokenizer tokens(moneyString, ' ');
- for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr)
+ for (char const* token : tokens)
{
- std::string tokenString(*itr);
+ std::string tokenString(token);
size_t gCount = std::count(tokenString.begin(), tokenString.end(), 'g');
size_t sCount = std::count(tokenString.begin(), tokenString.end(), 's');
size_t cCount = std::count(tokenString.begin(), tokenString.end(), 'c');
if (gCount + sCount + cCount != 1)
return 0;
- uint32 amount = strtoul(*itr, nullptr, 10);
+ uint32 amount = strtoul(token, nullptr, 10);
if (gCount == 1)
money += amount * 100 * 100;
else if (sCount == 1)
@@ -247,16 +247,16 @@ uint32 TimeStringToSecs(std::string const& timestring)
uint32 buffer = 0;
uint32 multiplier = 0;
- for (std::string::const_iterator itr = timestring.begin(); itr != timestring.end(); ++itr)
+ for (char itr : timestring)
{
- if (isdigit(*itr))
+ if (isdigit(itr))
{
buffer *= 10;
- buffer += (*itr) - '0';
+ buffer += itr - '0';
}
else
{
- switch (*itr)
+ switch (itr)
{
case 'd': multiplier = DAY; break;
case 'h': multiplier = HOUR; break;