Changeset 2128 for code/branches/pickups

Timestamp:

Nov 4, 2008, 12:13:51 PM (16 years ago)

Author:

dsommer

Message:

getnameofpermanents und switch

Location:

code/branches/pickups

Files:

• ShipEquipmentClasses.h (added)
• ShipItem.cpp (added)
• ShipItem.h (added)
• src/orxonox/objects/pickup/ShipEquipmentClasses.cc (modified) (2 diffs)
• src/orxonox/objects/pickup/ShipEquipmentClasses.h (modified) (1 diff)
• src/orxonox/objects/pickup/ShipItem.cc (modified) (1 diff)
• src/orxonox/objects/pickup/ShipItem.h (modified) (1 diff)

code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.cc

@@ -63 +63 @@
                 switch(toAddItem.CheckType()){
                         case Permanent:
-                                Equipment.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,*toAddItem) );
+                                Equipment.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
                                 break;
                         case Usable:
-                                Usable.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,*toAddItem) );
+                                Usable.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
                                 break;
                         case Trunk:
-                                Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,*toAddItem) );
+                                Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
                                 break;
                 }
@@ -76 +76 @@
         else if(toAddItem.CheckType()==Permanent){
                 if(CheckifSpace()==true)
-                        Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,*toAddItem) );
+                        Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
         
         }
                 
 }
+
+void SwitchItem(Permanent* toSwitchItem){
+        multimap<string, ShipItem*>::iterator it;
+        string equippedname;
+        equippedname=GetNameofPermanent(toSwitchItem.CheckSubType());
+        it=Equipment.find(equippedname);
+        Trunk.insert (find(equippedname));
+        Equipment.erase (it);
+        Equipment.insert(pair<std::string, ShipItem*>(toSwitchItem.itemname,toSwitchItem) 
+                        
+}
+
+string GetNameofPermanent (subItemTypePermanent NametoGet){
+                multimap<string, ShipItem*>::iterator it;
+                for ( it=Equipment.begin() ; it != Equipment.end(); it++ ){
+                        if((*it).second->CheckSubType()==NametoGet){
+                        return (*it).first.itemname;
+                        }
+                
+                }
+                return 0;
+}

code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.h

@@ -26 +26 @@
                 bool CheckifValid(Shipitem* toBeChecked);
                 bool CheckifSpace();
+                void SwitchItem(Permanent* toSwitchItem);
+                string GetNameofPermanent (subItemTypePermanent NametoGet); //holt den Namen des getragenen Items im jeweiligen Slot.
         private:
                 multimap<std::string, ShipItem*> Equipment;

code/branches/pickups/src/orxonox/objects/pickup/ShipItem.cc

@@ -12 +12 @@
         return this.subtype_permanent;
     }
+
+    subItemTypePowerups CheckSubType()
+    {
+        return this.subtype_powerups;
+    }
+    subItemTypeUsable CheckSubType()
+    {
+        return this.subtype_usables;
+    }
+
 }

code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h

@@ -20 +20 @@
         public:
                 itemType CheckType();
-                virtual
+                //virtual ChecksubType();
 
         private: