Changeset 6405 for code/branches/pickup2

Timestamp:

Dec 23, 2009, 8:27:17 PM (15 years ago)

Author:

dafrick

Message:

Commit changes in pickup before merge.

Location:

code/branches/pickup2/src

Files:

• libraries/core/Super.h (modified) (3 diffs)
• modules/CMakeLists.txt (modified) (1 diff)
• modules/pickup (added)
• modules/pickup/CMakeLists.txt (added)
• modules/pickup/DroppedItem.cc (moved) (moved from code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc)
• modules/pickup/DroppedItem.h (moved) (moved from code/branches/pickup2/src/orxonox/pickup/DroppedItem.h)
• modules/pickup/PickupCollection.cc (added)
• modules/pickup/PickupCollection.h (added)
• modules/pickup/PickupPrecompiledHeaders.h (added)
• modules/pickup/PickupPrereqs.h (added)
• modules/pickup/PickupSpawner.cc (moved) (moved from code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc) (10 diffs)
• modules/pickup/PickupSpawner.h (moved) (moved from code/branches/pickup2/src/orxonox/pickup/PickupSpawner.h) (5 diffs)
• modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (2 diffs)
• orxonox/OrxonoxPrereqs.h (modified) (2 diffs)
• orxonox/interfaces/InterfaceCompilation.cc (modified) (3 diffs)
• orxonox/interfaces/PickupCarrier.h (added)
• orxonox/interfaces/Pickupable.h (added)
• orxonox/items/Engine.cc (modified) (2 diffs)
• orxonox/pickup/CMakeLists.txt (modified) (2 diffs)
• orxonox/pickup/PickupCollection.cc (modified) (1 diff)
• orxonox/pickup/PickupCollection.h (modified) (3 diffs)
• orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)

code/branches/pickup2/src/libraries/core/Super.h

@@ -267 +267 @@
     #define SUPER_changedGametype(classname, functionname, ...) \
         SUPER_NOARGS(classname, functionname)
+        
+    #define SUPER_changedUsed(classname, functionname, ...) \
+        SUPER_NOARGS(classname, functionname)
     // (1/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
 
@@ -515 +518 @@
 
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(9, changedGametype, false)
+            ()
+        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
+        
+        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(10, changedUsed, false)
             ()
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
@@ -570 +577 @@
     SUPER_INTRUSIVE_DECLARATION(changedName);
     SUPER_INTRUSIVE_DECLARATION(changedGametype);
+    SUPER_INTRUSIVE_DECLARATION(changedUsed);
     // (3/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
 

code/branches/pickup2/src/modules/CMakeLists.txt

@@ -29 +29 @@
 ADD_SUBDIRECTORY(objects)
 ADD_SUBDIRECTORY(overlays)
+ADD_SUBDIRECTORY(pickup)
 ADD_SUBDIRECTORY(pong)
 ADD_SUBDIRECTORY(questsystem)

code/branches/pickup2/src/modules/pickup/PickupSpawner.cc

@@ -23 +23 @@
  *      Daniel 'Huty' Haggenmueller
  *   Co-authors:
- *      ...
+ *      Damian 'Mozork' Frick
  *
  */
@@ -34 +34 @@
 #include "PickupSpawner.h"
 
-#include "BaseItem.h"
-
 #include "core/CoreIncludes.h"
-#include "core/GUIManager.h"     // HACK; see below
+//#include "core/GUIManager.h"     // HACK; see below
 #include "core/Template.h"
 #include "core/XMLPort.h"
 #include "worldentities/pawns/Pawn.h"
-#include "PickupInventory.h"    // HACK; Only for hack, remove later
+//#include "PickupInventory.h"    // HACK; Only for hack, remove later
 
 
@@ -47 +45 @@
 {
 
-    const float PickupSpawner::bounceSpeed_s = 6.0f;
-    const float PickupSpawner::rotationSpeed_s = 1.0f;
-    const float PickupSpawner::bounceDistance_s = 4.0f;
+//     const float PickupSpawner::bounceSpeed_s = 6.0f;
+//     const float PickupSpawner::rotationSpeed_s = 1.0f;
+//     const float PickupSpawner::bounceDistance_s = 4.0f;
 
     CreateFactory(PickupSpawner);
@@ -64 +62 @@
     }
 
-    PickupSpawner::PickupSpawner(BaseObject* creator, BaseItem* item, float triggerDistance, float respawnTime, int maxSpawnedItems) : StaticEntity(creator)
+    PickupSpawner::PickupSpawner(BaseObject* creator, Pickupable* pickup, float triggerDistance, float respawnTime, int maxSpawnedItems) : StaticEntity(creator)
     {
         this->initialize();
   
-        //TODO: Does this actually work?
-        this->itemTemplateName_ = item->getIdentifier()->getName();
-        this->itemTemplate_ = Template::getTemplate(this->itemTemplateName_);
+        this->pickup_ = pickup;
 
         this->triggerDistance_ = triggerDistance;
@@ -81 +77 @@
         RegisterObject(PickupSpawner);
 
-        this->itemTemplate_ = NULL;
+        this->pickup_ = NULL;
+        
         this->triggerDistance_ = 20;
-        this->respawnTime_ = 0.0f;
-        this->tickSum_ = 0.0f;
+        this->respawnTime_ = 0;
+        this->tickSum_ = 0;
         this->maxSpawnedItems_ = INF;
         this->spawnsRemaining_ = INF;
@@ -110 +107 @@
         SUPER(PickupSpawner, XMLPort, xmlelement, mode);
 
-        XMLPortParam(PickupSpawner, "item", setItemTemplateName, getItemTemplateName, xmlelement, mode);
+        XMLPortObject(PickupSpawner, Pickupable, "pickup", addPickupable, getPickupable, xmlelement, mode);
+        
         XMLPortParam(PickupSpawner, "triggerDistance", setTriggerDistance, getTriggerDistance, xmlelement, mode);
         XMLPortParam(PickupSpawner, "respawnTime", setRespawnTime, getRespawnTime, xmlelement, mode);
@@ -119 +117 @@
         // Load the GUI image as soon as the PickupSpawner gets loaded
         //  = less delays while running
-        BaseObject* newObject = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this);
-        BaseItem* asItem = orxonox_cast<BaseItem*>(newObject);
-        if (asItem)
-        {
-            asItem->addTemplate(this->itemTemplate_);
-            PickupInventory::getImageForItem(asItem);
-            newObject->destroy();
-        }
+//         BaseObject* newObject = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this);
+//         BaseItem* asItem = orxonox_cast<BaseItem*>(newObject);
+//         if (asItem)
+//         {
+//             asItem->addTemplate(this->itemTemplate_);
+//             PickupInventory::getImageForItem(asItem);
+//             newObject->destroy();
+//         }
 
         //  & load the GUI itself too, along with some empty windows
         //   = even less delays
-        GUIManager::getInstance().showGUI("PickupInventory");
-        GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
-        PickupInventory::getSingleton();
+//         GUIManager::getInstance().showGUI("PickupInventory");
+//         GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
+//         PickupInventory::getSingleton();
+    }
+    
+    void PickupSpawner::addPickupable(Pickupable* pickup)
+    {
+        if(this->pickup_ != NULL)
+        {
+            COUT(1) << "addPickupable called, with this->pickup_ already set." << std::endl;
+            return;
+        }
+        if(pickup == NULL)
+        {
+            COUT(1) << "Argument of addPickupable is NULL." << std::endl;
+            return;
+        }
+        
+        this->pickup_ = pickup;
+    }
+    
+    Pickupable* PickupSpawner::getPickupable(void)
+    {
+        return this->pickup_;
     }
 
@@ -139 +158 @@
         Invoked when the activity has changed. Sets visibility of attached objects.
     */
-    void PickupSpawner::changedActivity()
-    {
-        SUPER(PickupSpawner, changedActivity);
-
-        for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
-            (*it)->setVisible(this->isActive());
-    }
-
-    /**
-    @brief
-        Set the template name of the item to spawn, also loads the template.
-    @param name
-        Name of the new template.
-    */
-    void PickupSpawner::setItemTemplateName(const std::string& name)
-    {
-        this->itemTemplateName_ = name;
-        this->itemTemplate_ = Template::getTemplate(name);
-    }
+//     void PickupSpawner::changedActivity()
+//     {
+//         SUPER(PickupSpawner, changedActivity);
+// 
+//         for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
+//             (*it)->setVisible(this->isActive());
+//     }
 
     void PickupSpawner::setMaxSpawnedItems(int items)
@@ -171 +178 @@
         Time since last tick.
     */
-    //TODO: Replace this with a real DistanceTrigger.
+    //TODO: Replace this with a real DistanceTrigger?
     void PickupSpawner::tick(float dt)
     {
+        //! If the PickupSpawner is active.
         if (this->isActive())
         {
-            //! Triggers as soon as a Pawn is in the specified distance.
+            //! Iterate trough all Pawns.
             for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
             {
                 Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
-                if (distance.length() < this->triggerDistance_)
+                //! If a Pawn, that fits the target-range of the item spawned by this Pickup, is in trigger-distance.
+                if (distance.length() < this->triggerDistance_ && this->pickup_->isTarget(*it))
+                {
                     this->trigger(*it);
+                }
             }
 
             //! Animation.
-            this->yaw(Radian(rotationSpeed_s*dt));
-            this->tickSum_ += bounceSpeed_s*dt;
-            this->translate(Vector3(0,bounceDistance_s*dt*sin(this->tickSum_),0));
-            if (this->tickSum_ > 2*Ogre::Math::PI)
-                this->tickSum_ -= 2*Ogre::Math::PI;
+//             this->yaw(Radian(rotationSpeed_s*dt));
+//             this->tickSum_ += bounceSpeed_s*dt;
+//             this->translate(Vector3(0,bounceDistance_s*dt*sin(this->tickSum_),0));
+//             if (this->tickSum_ > 2*Ogre::Math::PI)
+//                 this->tickSum_ -= 2*Ogre::Math::PI;
         }
     }
@@ -205 +216 @@
     void PickupSpawner::trigger(Pawn* pawn)
     {
-        if (this->isActive() && this->itemTemplate_ && this->itemTemplate_->getBaseclassIdentifier()) //!< Checks whether PickupItem is active, amongst other things.
-        {
-            BaseItem* item = this->getItem();
-            if (item != NULL) //!< If the conversion was successful.
+        //TODO: If private, isActive doesn't need to be tested anymore.
+        if (this->isActive()) //!< Checks whether PickupItem is active.
+        {
+            Pickupable* pickup = this->getPickup();
+            if (pickup != NULL) //!< If everything went ok, and pickup is not NULL.
             {
-                item->setPickupIdentifier(this->itemTemplateName_); //TODO: Needed?
-                item->addTemplate(this->itemTemplate_); //TODO: Does what?
-
-                if(item->pickedUp(pawn))
-                {
-                    COUT(3) << this->itemTemplateName_ << " got picked up." << std::endl;
-
-
-                    if(this->spawnsRemaining_ != INF)
-                    {
-                        this->spawnsRemaining_--;
-                    }
-
-                    if (this->spawnsRemaining_ != 0 && this->respawnTime_ > 0.0f)
-                    {
-                        this->respawnTimer_.setTimer(this->respawnTime_, false, createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback, this)));
-
-                        this->setActive(false);
-                        this->fireEvent();
-                    }
+                PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
+                if(carrier == NULL)
+                {
+                    COUT(1) << "This is bad. Pawn isn't PickupCarrier." << std::endl;
+                    return;
+                }
+                
+                if(pickup->pickup(carrier))
+                {
+                    COUT(3) << "Pickup got picked up." << std::endl;
+
+                    this->decrementSpawnsRemaining();
                 }
                 else
                 {
-                    item->destroy();
+                    pickup->destroy();
                 }
             }
         }
-
-        if(this->spawnsRemaining_ == 0)
+    }
+    
+    void PickupSpawner::decrementSpawnsRemaining(void)
+    {
+        if(this->spawnsRemaining_ != INF)
+        {
+            this->spawnsRemaining_--;
+        }
+        if(this->spawnsRemaining_ != 0 && this->respawnTime_ > 0)
+        {
+            //TODO: Nicer?
+            this->respawnTimer_.setTimer(this->respawnTime_, false, createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback, this)));
+
+            this->setActive(false);
+            this->fireEvent();
+        }
+        else
         {
             COUT(3) << "PickupSpawner empty, selfdistruct initialized." << std::endl;
             this->setActive(false);
-            this->destroy();
-        }
-    }
-
-    /**
-    @brief
-        Creates a BaseItem of the type specified by the PickupSpawner.
+            this->destroy(); //TODO: Implement destroy().
+        }
+    }
+
+    /**
+    @brief
+        Creates a new Pickupable.
     @return
-        The BaseItem created.
+        The Pickupable created.
     */    
-    BaseItem* PickupSpawner::getItem(void)
-    {
-        BaseObject* newItem = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this); //!< Creates new object of specified item type.
-        return orxonox_cast<BaseItem*>(newItem);
+    Pickupable* PickupSpawner::getPickup(void)
+    {
+        if(this->spawnsRemaining_ == 0)
+        {
+            COUT(1) << "Massive Error: PickupSpawner still alive until having spawned last item." << std::endl;
+            return NULL;
+        }
+        
+        Pickupable* pickup = this->pickup_->clone();
+        return pickup;
     }
 

code/branches/pickup2/src/modules/pickup/PickupSpawner.h

@@ -35 +35 @@
 #define _PickupSpawner_H__
 
-#include "OrxonoxPrereqs.h"
+#include "pickup/PickupPrereqs.h"
 
 #include <string>
@@ -41 +41 @@
 #include "tools/interfaces/Tickable.h"
 #include "worldentities/StaticEntity.h"
+#include "interfaces/Pickupable.h"
 
 namespace orxonox
@@ -51 +52 @@
     {
         public:
-            //TODO: Add limit of items spawned here. Also possibility to spawn collections?
+            //TODO: Add limit of items spawned here.
             PickupSpawner(BaseObject* creator);
-            PickupSpawner(BaseObject* creator, BaseItem* item, float triggerDistance, float respawnTime, int maxSpawnedItems);
+            PickupSpawner(BaseObject* creator, Pickupable* pickup, float triggerDistance, float respawnTime, int maxSpawnedItems);
             virtual ~PickupSpawner();
 
@@ -59 +60 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< Method for creating a PickupSpawner through XML.
             virtual void tick(float dt);
-
-            void trigger(Pawn* pawn);                                       //!< Method called when a Pawn is close enough.
-            void respawnTimerCallback();                                    //!< Method called when the timer runs out.
-
-            /**
-            @brief Get the template name for the item to spawn.
-            @return Returns the name of the template of the item to spawn.
-            */
-            inline const std::string& getItemTemplateName() const
-                { return this->itemTemplateName_; }
-            void setItemTemplateName(const std::string& name);              //!< Set the template name of the item to spawn.
-
-            /**
-                @brief Get the template for the item to spawn.
-                @return Returns the template of the item to spawn.
-            */
-            inline Template* getItemTemplate() const
-                { return this->itemTemplate_; }
 
             /**
@@ -110 +93 @@
 
         protected:
-            virtual BaseItem* getItem(void);
+            virtual Pickupable* getPickup(void);
+            
+            void addPickupable(Pickupable* pickup);
+            Pickupable* getPickupable(void);
+            
+            void decrementSpawnsRemaining(void);
 
         private:
             void initialize(void);
+            
+            void trigger(Pawn* pawn);                                       //!< Method called when a Pawn is close enough.
+            void respawnTimerCallback();                                    //!< Method called when the timer runs out.
 
-            std::string itemTemplateName_;          //!< Template name of the item to spawn.
-            Template* itemTemplate_;                //!< Template of the item to spawn.
+            
+            Pickupable* pickup_;
 
             int maxSpawnedItems_;                   //!< Maximum number of items spawned by this PickupSpawner.

code/branches/pickup2/src/modules/weapons/projectiles/Projectile.cc

@@ -123 +123 @@
 
             float dmg = this->damage_;
-            if (this->owner_)
-                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+            //TODO: Remove.
+//             if (this->owner_)
+//                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
 
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);

code/branches/pickup2/src/orxonox/CMakeLists.txt

@@ -46 +46 @@
 ADD_SUBDIRECTORY(items)
 ADD_SUBDIRECTORY(overlays)
-ADD_SUBDIRECTORY(pickup)
 ADD_SUBDIRECTORY(sound)
 ADD_SUBDIRECTORY(weaponsystem)
@@ -55 +54 @@
   TOLUA_FILES
     LevelManager.h
-    pickup/BaseItem.h
-    pickup/PickupInventory.h
   DEFINE_SYMBOL
     "ORXONOX_SHARED_BUILD"

code/branches/pickup2/src/orxonox/OrxonoxPrereqs.h

@@ -117 +117 @@
     class GametypeMessageListener;
     class NotificationListener;
+    class Pickupable;
+    class PickupCarrier;
     class PlayerTrigger;
     class RadarListener;
@@ -133 +135 @@
     class OrxonoxOverlay;
     class OverlayGroup;
-
-    // pickup
-    class BaseItem;
-    class DroppedItem;
-    class EquipmentItem;
-    class ModifierPickup;
-    class PassiveItem;
-    class PickupCollection;
-    class PickupInventory;
-    class PickupSpawner;
-    class UsableItem;
-    // pickup, items
-    class HealthImmediate;
-    class HealthUsable;
-    class Jump;
 
     //sound

code/branches/pickup2/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -34 +34 @@
 
 #include "GametypeMessageListener.h"
+#include "Pickupable.h"
+#include "PickupCarrier.h"
 #include "PlayerTrigger.h"
 #include "RadarListener.h"
@@ -51 +53 @@
         RegisterRootObject(GametypeMessageListener);
     }
+    
+    //----------------------------
+    // Pickupable
+    //----------------------------
+    Pickupable::Pickupable()
+    {
+        RegisterRootObject(Pickupable);
 
+        this->used_ = false;
+        this->owner_ = NULL;
+    }
+    
+    //----------------------------
+    // PickupCarrier
+    //----------------------------
+    PickupCarrier::PickupCarrier()
+    {
+        RegisterRootObject(PickupCarrier);
+    }
+
+    //----------------------------
+    // PlayerTrigger
+    //----------------------------
+    PlayerTrigger::PlayerTrigger()
+    {
+        RegisterRootObject(PlayerTrigger);
+
+        this->player_ = NULL;
+        this->isForPlayer_ = true;
+    }
+    
     //----------------------------
     // RadarListener
@@ -83 +115 @@
         RegisterRootObject(NotificationListener);
     }
-
-    //----------------------------
-    // PlayerTrigger
-    //----------------------------
-    PlayerTrigger::PlayerTrigger()
-    {
-        RegisterRootObject(PlayerTrigger);
-
-        this->player_ = NULL;
-        this->isForPlayer_ = true;
-    }
 }

code/branches/pickup2/src/orxonox/items/Engine.cc

@@ -35 +35 @@
 #include "Scene.h"
 #include "worldentities/pawns/SpaceShip.h"
-#include "pickup/ModifierType.h"
+//TODO: Remove.
+//#include "pickup/ModifierType.h"
 #include "tools/Shader.h"
 
@@ -193 +194 @@
         }
 
-        this->ship_->setAcceleration(this->ship_->getPickups().processModifiers(ModifierType::Acceleration, this->ship_->getOrientation() * acceleration, false));
+        //TODO: Remove.
+        //this->ship_->setAcceleration(this->ship_->getPickups().processModifiers(ModifierType::Acceleration, this->ship_->getOrientation() * acceleration, false));
 
         if (!this->ship_->getPermanentBoost())

code/branches/pickup2/src/orxonox/pickup/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BaseItem.cc
-  DroppedItem.cc
   EquipmentItem.cc
   ModifierPickup.cc
@@ -7 +6 @@
   PickupCollection.cc
   PickupInventory.cc
-  PickupSpawner.cc
   UsableItem.cc
 )

code/branches/pickup2/src/orxonox/pickup/PickupCollection.cc

@@ -52 +52 @@
 
     /**
-        @brief
-            Add an item to the collection.
-
-            Only adds the item if there's a free slot for it.
-
-        @param item Item to add to the collection.
-        @return Returns whether the item has been added to the collection.
+    @brief
+        Add an item to the collection.
+
+        Only adds the item if there's a free slot for it.
+
+    @param item
+        Item to add to the collection.
+    @return
+        Returns whether the item has been added to the collection.
     */
     bool PickupCollection::add(BaseItem* item)

code/branches/pickup2/src/orxonox/pickup/PickupCollection.h

@@ -50 +50 @@
     @author Daniel 'Huty' Haggenmueller
     */
-    class _OrxonoxExport PickupCollection
+    class _OrxonoxExport PickupCollection : public orxonox::OrxonoxClass
     {
         public:
-            //TODO: Should probably be derived from OrxonoxClass???
             PickupCollection();
 
@@ -65 +64 @@
             void remove(BaseItem* item, bool removeAllOfType = false);                  //!< Remove an item from the collection.
 
-            //TODO: What's up with that?
+            //TODO: Hmm... probably should stay...
             void useItem();                                                             //!< Use the first usable item.
             void useItem(UsableItem* item);                                             //!< Use a usable item.
-
-            //TODO: This really shouldn't be here. It's nbot the Collections business to know about stuff like that.
-            void addAdditiveModifier(ModifierType::Value type, float value);             //!< Add an additive modifier.
-            void addMultiplicativeModifier(ModifierType::Value type, float value);       //!< Add a multiplicative modifier.
-
-            float getAdditiveModifier(ModifierType::Value type);                         //!< Get total additive modifier.
-            float getMultiplicativeModifier(ModifierType::Value type);                   //!< Get total multiplicative modifier.
-
-            void removeAdditiveModifier(ModifierType::Value type, float value);          //!< Remove an additive modifier.
-            void removeMultiplicativeModifier(ModifierType::Value type, float value);    //!< Remove a multiplicative modifier.
-
-            float processModifiers(ModifierType::Value type, float inputValue, bool addBeforeMultiplication = false);        //!< Apply the modifiers to a float.
-            Vector3 processModifiers(ModifierType::Value type, Vector3 inputValue, bool addBeforeMultiplication = false);    //!< Apply the modifiers to a Vector3.
-
-            /**
-                @brief Get the map of contained items.
-                @return The map of items.
-            */
-            std::multimap<std::string, BaseItem*> getItems() const
-                { return this->items_; }
 
             /**
@@ -110 +89 @@
             std::deque<PassiveItem*> getPassiveItems();     //!< Get a list of passive items.
             std::deque<UsableItem*> getUsableItems();      //!< Get a list of usable items.
+
         private:
-            Pawn* owner_;           //!< The owner of the PickupCollection.
+            Pawn* owner_; //!< The owner of the PickupCollection.
             UsableItem* currentUsable_;
-
-            bool bBlockRemovals_;   //!< Whether to block direct removals through remove().
-
-            std::multimap<ModifierType::Value, float> additiveModifiers_;        //!< Contains additive modifiers (indexed by ModifierType).
-            std::multimap<ModifierType::Value, float> multiplicativeModifiers_;  //!< Contains multiplicative modifiers (indexed by ModifierType).
+            int slots_;
 
             std::multimap<std::string, BaseItem*> items_;                       //!< Map of items in the collection (indexed by pickupIdentifier of the items).

code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -70 +70 @@
         this->spawnparticleduration_ = 3.0f;
 
-        this->getPickups().setOwner(this);
+        //TODO: Remove.
+        //this->getPickups().setOwner(this);
 
         if (GameMode::isMaster())
@@ -295 +296 @@
     }
 
-    void Pawn::dropItems()
-    {
-        this->getPickups().clear();
-    }
+//TODO: Remove.
+//     void Pawn::dropItems()
+//     {
+//         this->getPickups().clear();
+//     }
 
 

code/branches/pickup2/src/orxonox/worldentities/pawns/Pawn.h

@@ -35 +35 @@
 #include "interfaces/RadarViewable.h"
 #include "worldentities/ControllableEntity.h"
-#include "pickup/PickupCollection.h"
+//TODO: Remove.
+//#include "pickup/PickupCollection.h"
 
 namespace orxonox
@@ -109 +110 @@
                 { return this->numexplosionchunks_; }
 
-            virtual void dropItems();
-            inline PickupCollection& getPickups()
-                { return this->pickups_; }
-            virtual void useItem()
-                { this->pickups_.useItem(); }
+//TODO: Remove.
+//             virtual void dropItems();
+//             inline PickupCollection& getPickups()
+//                 { return this->pickups_; }
+//             virtual void useItem()
+//                 { this->pickups_.useItem(); }
 
             virtual void startLocalHumanControl();
@@ -128 +130 @@
             bool bAlive_;
 
-            PickupCollection pickups_;
+            //TODO: Remove.
+            //PickupCollection pickups_;
 
             float health_;