Changeset 2055 for code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h

Timestamp:

Oct 29, 2008, 3:57:16 PM (16 years ago)

Author:

dsommer

Message:

Added checkifvalid, checkifslot and additem functions

File:

• code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h (modified) (5 diffs)

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

@@ -20 +20 @@
         public:
                 itemType CheckType();
+                virtual
 
         private:
                 itemType type;
+                string itemname;
         };
 
@@ -41 +43 @@
 
                         public:
-                                subItemTypeUseable CheckSubType();
+                                //subItemTypeUseable CheckSubType();
 
                         private:
-                                subItemTypeUseable subtype;
+                                subItemTypeUseable subtype_usable;
 };
 
@@ -61 +63 @@
 
                         private:
-                                subItemTypePermanent subtype;
+                                subItemTypePermanent subtype_permanent;
 };
 
@@ -67 +69 @@
 Class _OrxonoxExport Powerups : public ShipItem{
 
-        enum subItemTypePowerups{ //Diffrent Types of Items of the Type Powerups
+        enum subItem TypePowerups{ //Diffrent Types of Items of the Type Powerups
                         Weapon,
                         Boosters,
@@ -76 +78 @@
                         };
                         public:
-                        subItemTypePowerups CheckSubType();
+                        //subItemTypePowerups CheckSubType();
 
                         private:
-                        subItemTypePowerups subtype;
+                        subItemTypePowerups subtype_powerups;
 };