Changeset 6524 for code/trunk/src/orxonox/interfaces

Timestamp:

Mar 15, 2010, 3:27:09 PM (15 years ago)

Author:

dafrick

Message:

Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, very soon.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/interfaces/CMakeLists.txt (modified) (1 diff)
• src/orxonox/interfaces/InterfaceCompilation.cc (modified) (3 diffs)
• src/orxonox/interfaces/PickupCarrier.h (copied) (copied from code/branches/pickup3/src/orxonox/interfaces/PickupCarrier.h)
• src/orxonox/interfaces/Pickupable.cc (copied) (copied from code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc)
• src/orxonox/interfaces/Pickupable.h (copied) (copied from code/branches/pickup3/src/orxonox/interfaces/Pickupable.h)

code/trunk/src/orxonox/interfaces/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   InterfaceCompilation.cc
+  Pickupable.cc
   RadarViewable.cc
 )

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

@@ -34 +34 @@
 
 #include "GametypeMessageListener.h"
+#include "PickupCarrier.h"
 #include "PlayerTrigger.h"
 #include "RadarListener.h"
@@ -51 +52 @@
         RegisterRootObject(GametypeMessageListener);
     }
+    
+    //----------------------------
+    // PickupCarrier
+    //----------------------------
+    PickupCarrier::PickupCarrier()
+    {
+        RegisterRootObject(PickupCarrier);
+        
+    }
+    
+    PickupCarrier::~PickupCarrier()
+    {
+        for(std::set<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            (*it)->destroy();
+        }
+        
+        this->pickups_.clear();
+    }
 
+    //----------------------------
+    // PlayerTrigger
+    //----------------------------
+    PlayerTrigger::PlayerTrigger()
+    {
+        RegisterRootObject(PlayerTrigger);
+
+        this->player_ = NULL;
+        this->isForPlayer_ = true;
+    }
+    
     //----------------------------
     // RadarListener
@@ -83 +114 @@
         RegisterRootObject(NotificationListener);
     }
-
-    //----------------------------
-    // PlayerTrigger
-    //----------------------------
-    PlayerTrigger::PlayerTrigger()
-    {
-        RegisterRootObject(PlayerTrigger);
-
-        this->player_ = NULL;
-        this->isForPlayer_ = true;
-    }
 }