summaryrefslogtreecommitdiff
path: root/src/game-server/monstermanager.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2022-08-19 16:55:29 +0200
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2022-08-19 17:34:55 +0200
commit109b602701578b9f2b29282f84bf2757544f8d32 (patch)
treea2fd70556c86385a75bfb7651e865beb0a05fd37 /src/game-server/monstermanager.cpp
parent6c6090991e17276de09f5f82d2fc8a6c1adf5bf4 (diff)
downloadmanaserv-109b602701578b9f2b29282f84bf2757544f8d32.tar.gz
manaserv-109b602701578b9f2b29282f84bf2757544f8d32.tar.bz2
manaserv-109b602701578b9f2b29282f84bf2757544f8d32.tar.xz
manaserv-109b602701578b9f2b29282f84bf2757544f8d32.zip
Apply C++11 fixits
modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using
Diffstat (limited to 'src/game-server/monstermanager.cpp')
-rw-r--r--src/game-server/monstermanager.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index a5acd126..4f0ba519 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -44,7 +44,7 @@ void MonsterManager::initialize()
void MonsterManager::deinitialize()
{
- for (MonsterClasses::iterator i = mMonsterClasses.begin(),
+ for (auto i = mMonsterClasses.begin(),
i_end = mMonsterClasses.end(); i != i_end; ++i)
{
delete i->second;
@@ -60,7 +60,7 @@ MonsterClass *MonsterManager::getMonsterByName(const std::string &name) const
MonsterClass *MonsterManager::getMonster(int id) const
{
- MonsterClasses::const_iterator i = mMonsterClasses.find(id);
+ auto i = mMonsterClasses.find(id);
return i != mMonsterClasses.end() ? i->second : 0;
}
@@ -84,7 +84,7 @@ void MonsterManager::readMonsterNode(xmlNodePtr node, const std::string &filenam
return;
}
- MonsterClasses::iterator i = mMonsterClasses.find(monsterId);
+ auto i = mMonsterClasses.find(monsterId);
if (i != mMonsterClasses.end())
{
LOG_WARN("Monster Manager: Ignoring duplicate definition of "
@@ -92,7 +92,7 @@ void MonsterManager::readMonsterNode(xmlNodePtr node, const std::string &filenam
return;
}
- MonsterClass *monster = new MonsterClass(monsterId);
+ auto monster = new MonsterClass(monsterId);
mMonsterClasses[monsterId] = monster;
if (!name.empty())
@@ -194,7 +194,7 @@ void MonsterManager::readMonsterNode(xmlNodePtr node, const std::string &filenam
{
const std::string idText = XML::getProperty(subnode, "id",
std::string());
- AbilityManager::AbilityInfo *info = 0;
+ AbilityManager::AbilityInfo *info = nullptr;
if (utils::isNumeric(idText))
{
const int abilityId = utils::stringToInt(idText);