Apply C++11 fixits

modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using

1 files changed, 17 insertions, 18 deletions

diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp
index b4261e55..c6775e03 100644
--- a/src/game-server/state.cpp
+++ b/src/game-server/state.cpp
@@ -58,7 +58,7 @@ struct DelayedEvent
     MapComposite *map;
 };
 
-typedef std::map< Entity *, DelayedEvent > DelayedEvents;
+using DelayedEvents = std::map<Entity *, DelayedEvent>;
 
 /**
  * The current world time in ticks since server start.
@@ -94,10 +94,10 @@ static void serializeLooks(Entity *ch, MessageOut &msg)
 
     // Note that we can send several updates on the same slot type as different
     // items may have been equipped.
-    for (EquipData::const_iterator it = equipData.begin(),
+    for (auto it = equipData.begin(),
          it_end = equipData.end(); it != it_end; ++it)
     {
-        InventoryData::const_iterator itemIt = inventoryData.find(*it);
+        auto itemIt = inventoryData.find(*it);
 
         if (!itemManager->isEquipSlotVisible(itemIt->second.equipmentSlot))
             continue;
@@ -245,7 +245,7 @@ static void informPlayer(MapComposite *map, Entity *p)
             {
                 auto *beingComponent = o->getComponent<BeingComponent>();
                 const Hits &hits = beingComponent->getHitsTaken();
-                for (Hits::const_iterator j = hits.begin(),
+                for (auto j = hits.begin(),
                      j_end = hits.end(); j != j_end; ++j)
                 {
                     damageMsg.writeInt16(oid);
@@ -292,7 +292,7 @@ static void informPlayer(MapComposite *map, Entity *p)
 
                 case OBJECT_MONSTER:
                 {
-                    MonsterComponent *monsterComponent =
+                    auto monsterComponent =
                             o->getComponent<MonsterComponent>();
                     enterMsg.writeInt16(monsterComponent->getSpecy()->getId());
                     enterMsg.writeString(
@@ -301,7 +301,7 @@ static void informPlayer(MapComposite *map, Entity *p)
 
                 case OBJECT_NPC:
                 {
-                    NpcComponent *npcComponent =
+                    auto npcComponent =
                             o->getComponent<NpcComponent>();
                     enterMsg.writeInt16(npcComponent->getNpcId());
                     enterMsg.writeString(
@@ -411,7 +411,7 @@ static void informPlayer(MapComposite *map, Entity *p)
             {
                 case OBJECT_ITEM:
                 {
-                    ItemComponent *item = o->getComponent<ItemComponent>();
+                    auto item = o->getComponent<ItemComponent>();
                     ItemClass *itemClass = item->getItemClass();
 
                     if (oflags & UPDATEFLAG_NEW_ON_MAP)
@@ -434,7 +434,7 @@ static void informPlayer(MapComposite *map, Entity *p)
                 break;
                 case OBJECT_EFFECT:
                 {
-                    EffectComponent *e = o->getComponent<EffectComponent>();
+                    auto e = o->getComponent<EffectComponent>();
                     // Don't show old effects
                     if (!(oflags & UPDATEFLAG_NEW_ON_MAP))
                         break;
@@ -482,7 +482,7 @@ void GameState::update(int tick)
 
     // Update game state (update AI, etc.)
     const MapManager::Maps &maps = MapManager::getMaps();
-    for (MapManager::Maps::const_iterator m = maps.begin(),
+    for (auto m = maps.begin(),
          m_end = maps.end(); m != m_end; ++m)
     {
         MapComposite *map = m->second;
@@ -512,7 +512,7 @@ void GameState::update(int tick)
 #   endif
 
     // Take care of events that were delayed because of their side effects.
-    for (DelayedEvents::iterator it = delayedEvents.begin(),
+    for (auto it = delayedEvents.begin(),
          it_end = delayedEvents.end(); it != it_end; ++it)
     {
         const DelayedEvent &e = it->second;
@@ -558,7 +558,7 @@ bool GameState::insert(Entity *ptr)
     }
 
     // Check that coordinates are actually valid.
-    Entity *obj = static_cast< Entity * >(ptr);
+    auto obj = static_cast< Entity * >(ptr);
     Map *mp = map->getMap();
     Point pos = obj->getComponent<ActorComponent>()->getPosition();
     if ((int)pos.x / mp->getTileWidth() >= mp->getWidth() ||
@@ -604,7 +604,7 @@ bool GameState::insert(Entity *ptr)
 
         case OBJECT_MONSTER:
         {
-            MonsterComponent *monsterComponent =
+            auto monsterComponent =
                     obj->getComponent<MonsterComponent>();
             LOG_DEBUG("Monster inserted: "
                       << monsterComponent->getSpecy()->getId());
@@ -681,7 +681,7 @@ void GameState::remove(Entity *ptr)
 
         case OBJECT_MONSTER:
         {
-            MonsterComponent *monsterComponent =
+            auto monsterComponent =
                     ptr->getComponent<MonsterComponent>();
             LOG_DEBUG("Monster removed: "
                       << monsterComponent->getSpecy()->getId());
@@ -799,7 +799,7 @@ void GameState::enqueueInsert(Entity *ptr)
 {
     DelayedEvent event;
     event.type = EVENT_INSERT;
-    event.map = 0;
+    event.map = nullptr;
     enqueueEvent(ptr, event);
 }
 
@@ -807,7 +807,7 @@ void GameState::enqueueRemove(Entity *ptr)
 {
     DelayedEvent event;
     event.type = EVENT_REMOVE;
-    event.map = 0;
+    event.map = nullptr;
     enqueueEvent(ptr, event);
 }
 
@@ -884,8 +884,7 @@ void GameState::sayToAll(const std::string &text)
 
 std::string GameState::getVariable(const std::string &key)
 {
-    std::map<std::string, std::string>::iterator iValue =
-                                                     mScriptVariables.find(key);
+    auto iValue = mScriptVariables.find(key);
     if (iValue != mScriptVariables.end())
         return iValue->second;
     else
@@ -914,7 +913,7 @@ void GameState::callVariableCallbacks(const std::string &key,
                                       const std::string &value)
 {
     const MapManager::Maps &maps = MapManager::getMaps();
-    for (MapManager::Maps::const_iterator m = maps.begin(),
+    for (auto m = maps.begin(),
          m_end = maps.end(); m != m_end; ++m)
     {
         m->second->callWorldVariableCallback(key, value);