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

Timestamp:

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

Author:

dsommer

Message:

kleinigkeiten an checkSlot usw.

File:

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

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

@@ -16 +16 @@
                 COUT(3) << "swap?" << std::endl;
                 return false;
-        
+
         return false;
         };
@@ -24 +24 @@
         if(it != Equipment.end())
         {
-                //it->second->dropped(this->getPlayer());
                 Equipment.erase (it);
                 return true;
         }
-        else
-                return false;
+        return false;
         };
+        /*void print(std::multimap<std::string, Item*> eut)
+        {
+                std::multimap<std::string,Item*>::iterator it;
+                COUT(3) << "Liste:" <<  endl;
+                for ( it=eut.begin() ; it != eut.end(); ++it )
+                    COUT(3) << (*it).first << endl;
 
+        }*/
         void ShipEquipment::eraseAll()
         {
-                
+                //print(Equipment);
                 for (std::multimap<std::string,Item*>::iterator it = Equipment.begin(); it != Equipment.end(); )
                 {
-                
+
                         (it++)->second->dropped(this->getPlayer());
                 }
+                //print(Equipment);
         }
 
@@ -47 +53 @@
         for ( it= getPlayer()->getPickUp().getEquipment().begin() ; it != getPlayer()->getPickUp().getEquipment().end(); it++ )
         {
-                if((*it).second->getPlayerBaseClass()==item->getPlayerBaseClass())
+                //if((*it).second->getPlayerBaseClass()==item->getPlayerBaseClass())
+                if(item->isExactlyA((*it).second->getIdentifier()))
                 return false;
         }