Changeset 2293 for code/branches/pickups2/src

Timestamp:

Nov 28, 2008, 2:00:22 PM (16 years ago)

Author:

dsommer

Message:

private umgangen aber er liesst irgendwie die libs nicht :S

Location:

code/branches/pickups2/src/orxonox/objects

Files:

• pickup/Item.cc (modified) (4 diffs)
• pickup/Item.h (modified) (2 diffs)
• pickup/ShipEquipment.cc (modified) (3 diffs)
• pickup/ShipEquipment.h (modified) (1 diff)
• worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/pickups2/src/orxonox/objects/pickup/Item.cc

@@ -1 +1 @@
 /* has to be added to player
    multimap<std::string, Item*> Equipment;*/
+
 
 #include "Item.h"
@@ -27 +28 @@
     }
 
-void Item::addTo (Pawn* player)
+bool Item::addTo (Pawn* player)
 {
-        if(checkSlot(player)==true)
+        /*if(checkSlot(player)==true)
         player->pickUp.Equipment.insert ( std::pair<std::string, Item*>(this->getName(),this) );
         else
-        COUT(3) << "swap?" << std::endl;
+        COUT(3) << "swap?" << std::endl;*/
+        return player->getPickUp().insert(this);
 }
 bool Item::remove(Pawn* player)
 {
-        if(player->pickUp.Equipment.find(this->getName())!= player->pickUp.Equipment.end())
+        /*if(player->pickUp.Equipment.find(this->getName())!= player->pickUp.Equipment.end())
         {
         std::multimap<std::string,Item*>::iterator it;
@@ -44 +46 @@
         }
         else
-        return false;
+        return false;*/
+        return player->getPickUp().erase(this);
 }
 bool Item::checkSlot(Pawn* player)
 {
-        std::multimap<std::string,Item*>::iterator it;
+        /*std::multimap<std::string,Item*>::iterator it;
         for ( it=player->pickUp.Equipment.begin() ; it != player->pickUp.Equipment.end(); it++ )
         {
@@ -54 +57 @@
         return false;
         }
-        return true;
+        return true;*/
+        return player->getPickUp().checkSlot(this);
 }
 void Item::setPlayerBaseClassName(const std::string& name)

code/branches/pickups2/src/orxonox/objects/pickup/Item.h

@@ -4 +4 @@
 #include "core/BaseObject.h"
 #include "OrxonoxPrereqs.h"
+#include "ShipEquipment.h"
 
 namespace orxonox
@@ -18 +19 @@
         virtual bool dropped(Pawn* player) { return true; } //erst bei festen Items
         bool remove(Pawn* player);
-        void addTo(Pawn* player);
+        bool addTo(Pawn* player);
 
         inline void setPlayerBaseClass(Identifier* identifier)

code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc

@@ +1 @@
+#include "Item.h"
 
-#include "ShipEquipment.h"
 
 namespace orxonox
 {
-        bool insert(Item* item)
+        bool ShipEquipment::insert(Item* item)
         {
         if(checkSlot(player)==true)
@@ -11 +11 @@
                 COUT(3) << "swap?" << std::endl;
         
-
-
-
-
         };
-        bool erase (Item* item)
+        bool ShipEquipment::erase (Item* item)
         {
         if(Equipment.find(item->getName())!= Equipment.end())
@@ -28 +24 @@
                 return false;
         };
-        bool checkSlot(Item* item) const
+        bool ShipEquipment::checkSlot(Item* item) const
         {
         std::multimap<std::string,Item*>::iterator it;

code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h

@@ -29 +29 @@
         bool insert(Item* item);
         bool erase (Item* item);
-        bool checkSlot(Item* item) const;
+        const bool checkSlot(Item* item) const;
 //      const std::multimap<std::string, Item*>& getEquipment() const { return this->Equipment; }
 

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

@@ -75 +75 @@
 
             virtual void fire();
-            ShipEquipment pickUp;
+            inline ShipEquipment& getPickUp()
+                {return this->pickUp;}
             virtual void postSpawn();
 
@@ -81 +82 @@
             virtual void spawn();
             virtual void death();
-
+            ShipEquipment pickUp;
             bool bAlive_;