Changeset 2055 for code/branches/pickups/src/orxonox/objects/pickup
- Timestamp:
- Oct 29, 2008, 3:57:16 PM (16 years ago)
- Location:
- code/branches/pickups/src/orxonox/objects/pickup
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.h
r1998 r2055 22 22 class _OrxonoxExport ShipEquipment{ 23 23 public: 24 void AddItem(Shipitem toAddItem);25 void RemoveItem(Shipitem toRemoveItem);26 bool CheckifValid(Shipitem toBeChecked);27 int24 void AddItem(Shipitem* toAddItem); 25 void RemoveItem(Shipitem* toRemoveItem); 26 bool CheckifValid(Shipitem* toBeChecked); 27 bool CheckifSpace(); 28 28 private: 29 std::map<std::string, Item*> Shipitems;30 31 29 multimap<std::string, ShipItem*> Equipment; 30 multimap<std::string, ShipItem*> Usable; 31 multimap<std::string, ShipItem*> Trunk; 32 32 33 33 34 35 } 34 36 35 37 -
code/branches/pickups/src/orxonox/objects/pickup/ShipItem.cc
r1998 r2055 5 5 return This.type}; 6 6 7 subItemTypePermanent CheckSubType(){ 8 return This.subtype_permanent}; 7 9 -
code/branches/pickups/src/orxonox/objects/pickup/ShipItem.h
r2000 r2055 20 20 public: 21 21 itemType CheckType(); 22 virtual 22 23 23 24 private: 24 25 itemType type; 26 string itemname; 25 27 }; 26 28 … … 41 43 42 44 public: 43 subItemTypeUseable CheckSubType();45 //subItemTypeUseable CheckSubType(); 44 46 45 47 private: 46 subItemTypeUseable subtype ;48 subItemTypeUseable subtype_usable; 47 49 }; 48 50 … … 61 63 62 64 private: 63 subItemTypePermanent subtype ;65 subItemTypePermanent subtype_permanent; 64 66 }; 65 67 … … 67 69 Class _OrxonoxExport Powerups : public ShipItem{ 68 70 69 enum subItem TypePowerups{ //Diffrent Types of Items of the Type Powerups71 enum subItem TypePowerups{ //Diffrent Types of Items of the Type Powerups 70 72 Weapon, 71 73 Boosters, … … 76 78 }; 77 79 public: 78 subItemTypePowerups CheckSubType();80 //subItemTypePowerups CheckSubType(); 79 81 80 82 private: 81 subItemTypePowerups subtype ;83 subItemTypePowerups subtype_powerups; 82 84 }; 83 85
Note: See TracChangeset
for help on using the changeset viewer.