Changeset 6711 for code/trunk/src/orxonox/worldentities

Timestamp:

Apr 13, 2010, 10:16:10 AM (15 years ago)

Author:

dafrick

Message:

Merged pickup4 branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)
• src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -78 +78 @@
         else
             this->weaponSystem_ = 0;
+        
+        this->setCarrierName("Pawn");
 
         this->setRadarObjectColour(ColourValue::Red);

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -37 +37 @@
 #include "worldentities/ControllableEntity.h"
 
-namespace orxonox
-{
-    class _OrxonoxExport Pawn : public ControllableEntity, public RadarViewable, public PickupCarrier
-    {
+namespace orxonox // tolua_export
+{ // tolua_export
+    class _OrxonoxExport Pawn // tolua_export
+        : public ControllableEntity, public RadarViewable, public PickupCarrier
+    { // tolua_export
         friend class WeaponSystem;
 
@@ -132 +133 @@
             bool bAlive_;
 
-            virtual std::list<PickupCarrier*>* getCarrierChildren(void)
-                { return new std::list<PickupCarrier*>(); }
+            virtual std::vector<PickupCarrier*>* getCarrierChildren(void)
+                { return new std::vector<PickupCarrier*>(); }
             virtual PickupCarrier* getCarrierParent(void)
                 { return NULL; }
@@ -155 +156 @@
 
             Vector3 aimPosition_;
-    };
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _Pawn_H__ */

code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -221 +221 @@
     }
 
-    std::list<PickupCarrier*>* SpaceShip::getCarrierChildren(void)
-    {
-        std::list<PickupCarrier*>* list = new std::list<PickupCarrier*>();
-        list->push_front(this->engine_);
+    std::vector<PickupCarrier*>* SpaceShip::getCarrierChildren(void)
+    {
+        std::vector<PickupCarrier*>* list = new std::vector<PickupCarrier*>();
+        list->push_back(this->engine_);
         return list;
     }

code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -86 +86 @@
 
         protected:
-            virtual std::list<PickupCarrier*>* getCarrierChildren(void);
+            virtual std::vector<PickupCarrier*>* getCarrierChildren(void);
             bool bInvertYAxis_;