Changeset 2136 for code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.h

Timestamp:

Nov 4, 2008, 9:53:12 PM (17 years ago)

Author:

landauf

Message:

merged changes from pickups1 to pickups2, not merged (probably) accidentally added files

Location:

code/branches/pickups2

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/ShipEquipmentClasses.h (modified) (1 diff)

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

@@ -27 +27 @@
             bool CheckifValid(Shipitem* toBeChecked);
             bool CheckifSpace();
+            void SwitchItem(Permanent* toSwitchItem);
+            string GetNameofPermanent (subItemTypePermanent NametoGet); //holt den Namen des getragenen Items im jeweiligen Slot.
 
         private: