Changeset 9293 for code/branches/presentation2012merge

Timestamp:

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

Author:

dafrick

Message:

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

Location:

code/branches/presentation2012merge/src

Files:

• modules/pickup/PickupCollection.cc (modified) (2 diffs)
• orxonox/interfaces/Pickupable.cc (modified) (1 diff)
• orxonox/interfaces/Pickupable.h (modified) (1 diff)

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;

code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc

@@ -104 +104 @@
     void Pickupable::destroyPickup(void)
     {
-        if(!this->beingDestroyed_)
+        if(!this->isBeingDestroyed())
             this->OrxonoxClass::destroy();
         else

code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.h

@@ -172 +172 @@
             inline void setDisabled(void)
                 { this->enabled_ = false; }
+
+            /**
+            @brief Check whether the Pickupable is in the process of being destroyed.
+            @return Returns true if so.
+            */
+            inline bool isBeingDestroyed(void)
+                { return this->beingDestroyed_; }
 
             /**