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

Timestamp:

Dec 10, 2008, 5:25:38 PM (15 years ago)

Author:

dsommer

Message:

funktioniert

File:

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

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

@@ -9 +9 @@
         bool ShipEquipment::insert(Item* item)
         {
-        if(checkSlot(item)==true)
+        if(checkSlot(item)==NULL)
         {
                 Equipment.insert ( std::pair<std::string, Item*>(item->getName(),item) );
                 return true;
         }
-                COUT(3) << "swap?" << std::endl;
+        else
+        {
+                COUT(3) << "SWAP?" <<  endl;
+                if((checkSlot(item)->dropped(player))==true);
+                {
+                        Equipment.insert ( std::pair<std::string, Item*>(item->getName(),item) );
+                        COUT(3) << "SWAPPED!" <<  endl;
+                        return true;
+                }
                 return false;
+        }
 
         return false;
@@ -48 +57 @@
         }
 
-        bool ShipEquipment::checkSlot(Item* item)
+        Item* ShipEquipment::checkSlot(Item* item)
         {
         std::multimap<std::string,Item*>::iterator it;
@@ -55 +64 @@
                 //if((*it).second->getPlayerBaseClass()==item->getPlayerBaseClass())
                 if(item->isExactlyA((*it).second->getIdentifier()))
-                return false;
+                return (*it).second;
         }
-        return true;
+        return NULL;
         };
+        
 }