Changeset 10916 for code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

File:

• code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc (modified) (6 diffs)

code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc

@@ -235 +235 @@
     {
         int numQuests = 0;
-        for(auto & elem : this->questMap_)
-        {
-            if(elem.second->getParentQuest() == nullptr && !elem.second->isInactive(player))
+        for(auto& mapEntry : this->questMap_)
+        {
+            if(mapEntry.second->getParentQuest() == nullptr && !mapEntry.second->isInactive(player))
                 numQuests++;
         }
@@ -255 +255 @@
     Quest* QuestManager::getRootQuest(PlayerInfo* player, int index)
     {
-        for(auto & elem : this->questMap_)
-        {
-            if(elem.second->getParentQuest() == nullptr && !elem.second->isInactive(player) && index-- == 0)
-                return elem.second;
+        for(auto& mapEntry : this->questMap_)
+        {
+            if(mapEntry.second->getParentQuest() == nullptr && !mapEntry.second->isInactive(player) && index-- == 0)
+                return mapEntry.second;
         }
         return nullptr;
@@ -280 +280 @@
         std::list<Quest*> quests = quest->getSubQuestList();
         int numQuests = 0;
-        for(auto & quest : quests)
-        {
-            if(!(quest)->isInactive(player))
+        for(Quest* subquest : quests)
+        {
+            if(!subquest->isInactive(player))
                 numQuests++;
         }
@@ -304 +304 @@
 
         std::list<Quest*> quests = quest->getSubQuestList();
-        for(auto & quest : quests)
-        {
-            if(!(quest)->isInactive(player) && index-- == 0)
+        for(Quest* subquest : quests)
+        {
+            if(!subquest->isInactive(player) && index-- == 0)
                 return quest;
         }
@@ -326 +326 @@
         std::list<QuestHint*> hints = quest->getHintsList();
         int numHints = 0;
-        for(auto & hint : hints)
-        {
-            if((hint)->isActive(player))
+        for(QuestHint* hint : hints)
+        {
+            if(hint->isActive(player))
                 numHints++;
         }
@@ -349 +349 @@
     {
         std::list<QuestHint*> hints = quest->getHintsList();
-        for(auto & hint : hints)
-        {
-            if((hint)->isActive(player) && index-- == 0)
+        for(QuestHint* hint : hints)
+        {
+            if(hint->isActive(player) && index-- == 0)
                 return hint;
         }