Changeset 7494 for code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc

Timestamp:

Sep 28, 2010, 5:31:59 PM (14 years ago)

Author:

dafrick

Message:

Some documenting and cleaning up/re-organization in pickups module.

File:

• code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) (2 diffs)

code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -34 +34 @@
 
 #include "GametypeMessageListener.h"
-#include "PickupCarrier.h"
 #include "PlayerTrigger.h"
 #include "RadarListener.h"
@@ -51 +50 @@
     {
         RegisterRootObject(GametypeMessageListener);
-    }
-
-    //----------------------------
-    // PickupCarrier
-    //----------------------------
-    PickupCarrier::PickupCarrier()
-    {
-        RegisterRootObject(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)->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++;
-            }
-        }
-
-        this->pickups_.clear();
     }