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

Timestamp:

Dec 4, 2008, 1:20:58 PM (17 years ago)

Author:

dsommer

Message:

kleinigkeiten an checkSlot usw.

File:

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

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

@@ -31 +31 @@
 bool Item::addTo (Pawn* player)
 {
-        
+
         return player->getPickUp().insert(this);
         /*if(checkSlot(player)==true)
@@ -53 +53 @@
 bool Item::checkSlot(Pawn* player)
 {
-        std::multimap<std::string,Item*>::iterator 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_)
+                //das isch schmarre...machs mit isExactlyA(...)
         return false;
         }
-        return true;
-        //return player->getPickUp().checkSlot(player);
+        return true;*/
+        return player->getPickUp().checkSlot(this);
 }
 void Item::setPlayerBaseClassName(const std::string& name)