Changeset 2864 for code/branches/pickups/src/orxonox/objects/worldentities

Timestamp:

Mar 30, 2009, 2:27:26 PM (16 years ago)

Author:

danielh

Message:

first commit of pickup system

• working PickupCollection
• working PickupSpawner
• base classes for items
• updated Pawn to include PickupCollection
• updated Projectile to use damage modifier on hit

Location:

code/branches/pickups/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.cc (modified) (4 diffs)
• Pawn.h (modified) (3 diffs)

code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "util/Exception.h"
 #include "util/Math.h"
 #include "PawnManager.h"
@@ -62 +61 @@
         this->spawnparticleduration_ = 3.0f;
 
+        this->getPickups().setOwner(this);
+
         if (Core::isMaster())
         {
@@ -204 +205 @@
             this->setDestroyWhenPlayerLeft(false);
 
+            this->dropItems();
+
             if (this->getGametype())
                 this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
@@ -266 +269 @@
     void Pawn::dropItems()
     {
-        ThrowException(NotImplemented, "Pickupsystem not implemented yet.");
+        this->getPickups().clear();
     }
 

code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -34 +34 @@
 #include "objects/RadarViewable.h"
 #include "objects/weaponSystem/WeaponSystem.h"
+#include "objects/pickup/PickupCollection.h"
 
 namespace orxonox
@@ -107 +108 @@
 
             virtual void dropItems();
+            inline PickupCollection& getPickups()
+                { return this->pickups_; }
 
         protected:
@@ -115 +118 @@
             bool bAlive_;
 
+            PickupCollection pickups_;
 
             float health_;