Changeset 2293 for code/branches/pickups2/src/orxonox/objects/pickup/Item.cc

Timestamp:

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

Author:

dsommer

Message:

private umgangen aber er liesst irgendwie die libs nicht :S

File:

• code/branches/pickups2/src/orxonox/objects/pickup/Item.cc (modified) (4 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)