Changeset 9292 for code/branches/presentation2012merge/src

Timestamp:

Jun 11, 2012, 10:40:01 PM (12 years ago)

Author:

dafrick

Message:

Looked through recten changes in pickup module, should be fine!

File:

• code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) (1 diff)

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

@@ -273 +273 @@
     const Pickupable* PickupCollection::getPickupable(unsigned int index) const
     {
-        unsigned int count = 0;
-        for (std::list<CollectiblePickup*>::const_iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
-        {
-            if (count == index)
-                return *it;
-            else
-                ++count;
-        }
-        return NULL;
+        if(this->pickups_.size() >= index)
+            return NULL;
+
+        std::list<CollectiblePickup*>::iterator it = this->pickups_.begin();
+        std::advance(it, index);
+        return *it;
     }