Changeset 10916 for code/branches/cpp11_v2/src/modules/pickup

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

Location:

code/branches/cpp11_v2/src/modules/pickup

Files:

• PickupCollection.cc (modified) (6 diffs)
• PickupManager.cc (modified) (1 diff)
• items/MetaPickup.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/pickup/PickupCollection.cc

@@ -68 +68 @@
     {
         // Destroy all Pickupables constructing this PickupCollection.
-        for(auto & elem : this->pickups_)
-        {
-            (elem)->wasRemovedFromCollection();
-            (elem)->destroy();
+        for(CollectiblePickup* pickup : this->pickups_)
+        {
+            pickup->wasRemovedFromCollection();
+            pickup->destroy();
         }
         this->pickups_.clear();
@@ -99 +99 @@
         this->processingUsed_ = true;
         // Change used for all Pickupables this PickupCollection consists of.
-        for(auto & elem : this->pickups_)
-            (elem)->setUsed(this->isUsed());
+        for(CollectiblePickup* pickup : this->pickups_)
+            pickup->setUsed(this->isUsed());
 
         this->processingUsed_ = false;
@@ -119 +119 @@
         size_t numPickupsEnabled = 0;
         size_t numPickupsInUse = 0;
-        for(auto & elem : this->pickups_)
-        {
-            if ((elem)->isEnabled())
+        for(CollectiblePickup* pickup : this->pickups_)
+        {
+            if (pickup->isEnabled())
                 ++numPickupsEnabled;
-            if ((elem)->isUsed())
+            if (pickup->isUsed())
                 ++numPickupsInUse;
         }
@@ -146 +146 @@
 
         // Change the PickupCarrier for all Pickupables this PickupCollection consists of.
-        for(auto & elem : this->pickups_)
+        for(CollectiblePickup* pickup : this->pickups_)
         {
             if(this->getCarrier() == nullptr)
-                (elem)->setCarrier(nullptr);
+                pickup->setCarrier(nullptr);
             else
-                (elem)->setCarrier(this->getCarrier()->getTarget(elem));
+                pickup->setCarrier(this->getCarrier()->getTarget(pickup));
         }
     }
@@ -186 +186 @@
         // If at least all the enabled pickups of this PickupCollection are no longer picked up.
         bool isOnePickupEnabledAndPickedUp = false;
-        for(auto & elem : this->pickups_)
-        {
-            if ((elem)->isEnabled() && (elem)->isPickedUp())
+        for(CollectiblePickup* pickup : this->pickups_)
+        {
+            if (pickup->isEnabled() && pickup->isPickedUp())
             {
                 isOnePickupEnabledAndPickedUp = true;
@@ -208 +208 @@
     bool PickupCollection::isTarget(const PickupCarrier* carrier) const
     {
-        for(const auto & elem : this->pickups_)
-        {
-            if(!carrier->isTarget(elem))
+        for(CollectiblePickup* pickup : this->pickups_)
+        {
+            if(!carrier->isTarget(pickup))
                 return false;
         }

code/branches/cpp11_v2/src/modules/pickup/PickupManager.cc

@@ -91 +91 @@
 
         // Destroying all the PickupInventoryContainers that are still there.
-        for(auto & elem : this->pickupInventoryContainers_)
-            delete elem.second;
+        for(auto& mapEntry : this->pickupInventoryContainers_)
+            delete mapEntry.second;
         this->pickupInventoryContainers_.clear();
 

code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc

@@ -118 +118 @@
                 std::set<Pickupable*> pickups = carrier->getPickups();
                 // Iterate over all Pickupables of the PickupCarrier.
-                for(auto pickup : pickups)
+                for(Pickupable* pickup : pickups)
                 {
-                    
                     if(pickup == nullptr || pickup == this)
                         continue;