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

Timestamp:

Dec 3, 2008, 4:07:49 PM (16 years ago)

Author:

dsommer

Message:

Aufnehmen von festen Item und wieder ablegen

File:

• code/branches/pickups2/src/orxonox/objects/pickup/Item.cc (modified) (3 diffs)

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

@@ -8 +8 @@
 #include "util/String.h"
 #include "objects/worldentities/pawns/Pawn.h"
+
 
 namespace orxonox
@@ -30 +31 @@
 bool Item::addTo (Pawn* player)
 {
+        
+        return player->getPickUp().insert(this);
         /*if(checkSlot(player)==true)
         player->pickUp.Equipment.insert ( std::pair<std::string, Item*>(this->getName(),this) );
         else
         COUT(3) << "swap?" << std::endl;*/
-        return player->getPickUp().insert(this);
 }
 bool Item::remove(Pawn* player)
@@ -51 +53 @@
 bool Item::checkSlot(Pawn* player)
 {
-        /*std::multimap<std::string,Item*>::iterator it;
-        for ( it=player->pickUp.Equipment.begin() ; it != player->pickUp.Equipment.end(); it++ )
+        std::multimap<std::string,Item*>::iterator it;
+        for ( it=player->getPickUp().getEquipment().begin() ; it != player->getPickUp().getEquipment().end(); it++ )
         {
         if((*it).second->playerBaseClass_==this->playerBaseClass_)
         return false;
         }
-        return true;*/
-        return player->getPickUp().checkSlot(this);
+        return true;
+        //return player->getPickUp().checkSlot(player);
 }
 void Item::setPlayerBaseClassName(const std::string& name)