Changeset 7162 for code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc

Timestamp:

Aug 8, 2010, 8:53:52 PM (14 years ago)

Author:

dafrick

Message:

Significant structural changes to the pickup module. Lots of bugs found and fixed.
Introduced a new class CollectiblePickup (which is now the only kind a PickupCollection can consist of) to solve some issues cleanly.
MetaPickup received additional functionality. It can now also be set to either destroy all the pickups of a PickupCarrier or destroy the PickupCarrier itself. (This was done mainly for testing purposes)
I've done some extensive testing on the pickups, so they should really work now.

File:

• code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc (modified) (1 diff)

code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -59 +59 @@
     {
         RegisterRootObject(PickupCarrier);
-
-        this->setCarrierName("PickupCarrier");
     }
 
     PickupCarrier::~PickupCarrier()
     {
+
+    }
+
+    void PickupCarrier::preDestroy(void)
+    {
         std::set<Pickupable*>::iterator it = this->pickups_.begin();
+        std::set<Pickupable*>::iterator temp;
         while(it != this->pickups_.end())
         {
-            (*it)->destroy();
+            (*it)->carrierDestroyed();
+            temp = it;
             it = this->pickups_.begin();
+            if(it == temp) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure.
+            {
+                COUT(2) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << (*temp) << ") didn't unregister itself as it should have." << std::endl;;
+                it++;
+            }
         }