Changeset 6512 for code/branches/pickup3/src/orxonox

Timestamp:

Mar 11, 2010, 4:30:30 PM (15 years ago)

Author:

dafrick

Message:

Added additional pickup (TestPickup), and did some bug $fixing.

Location:

code/branches/pickup3/src/orxonox/interfaces

Files:

• PickupCarrier.h (modified) (6 diffs)
• Pickupable.cc (modified) (1 diff)

code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h

@@ -40 +40 @@
 #include <set>
 #include "Pickupable.h"
+#include "core/Identifier.h"
 
 #include "core/OrxonoxClass.h"
@@ -45 +46 @@
 namespace orxonox
 {
+    
+    class Pickup;
+    class HealthPickup;
+    class TestPickup;
 
     /**
@@ -55 +60 @@
     {
         friend class Pickupable; //!< The Pickupable has full acces to its PickupCarrier.
+        //TODO: Ugly workaround.
+        friend class Pickup;
+        friend class HealthPickup;
+        friend class TestPickup;
         
         public:
@@ -69 +78 @@
                     bool pickedUp = this->pickups_.insert(pickup).second;
                     if(pickedUp)
+                    {
+                        COUT(4) << "Picked up Pickupable " << pickup->getIdentifier()->getName() << "(&" << pickup << ")." << std::endl;
                         pickup->pickedUp(this);
+                    }
                     return pickedUp;
                 }
@@ -81 +93 @@
             bool drop(Pickupable* pickup, bool drop = true)
                 { 
-                   bool dropped = this->pickups_.erase(pickup) == 1;
-                   if(dropped && drop)
-                   {
-                       pickup->dropped();
-                   }
-                   return dropped;
+                    bool dropped = this->pickups_.erase(pickup) == 1;
+                    if(dropped && drop)
+                    {
+                        COUT(4) << "Dropping Pickupable " << pickup->getIdentifier()->getName() << "(&" << pickup << ")." << std::endl;
+                        pickup->dropped();
+                    }
+                    return dropped;
                 }
                 
@@ -161 +174 @@
             */
             virtual const Vector3& getCarrierPosition(void) = 0;
+                            
+            //TODO: Remove.
+            std::set<Pickupable*>& getPickups(void)
+                { return this->pickups_; }
         
         private:

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

@@ -198 +198 @@
         //TODO: possible problem.
         if(!created)
+        {
             this->destroy();
+        }
         
         return true;