Changeset 9293 for code/branches/presentation2012merge/src/modules/pickup

Timestamp:

Jun 11, 2012, 10:57:40 PM (13 years ago)

Author:

dafrick

Message:

Should fix internal warnig (and compile error introduced in last commit)

File:

• code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) (2 diffs)

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

@@ -75 +75 @@
         for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
         {
+            if((*it)->isBeingDestroyed())
+                continue;
+
             (*it)->wasRemovedFromCollection();
             (*it)->destroyPickup();
@@ -276 +279 @@
             return NULL;
 
-        std::list<CollectiblePickup*>::iterator it = this->pickups_.begin();
+        std::list<CollectiblePickup*>::const_iterator it = this->pickups_.begin();
         std::advance(it, index);
         return *it;