Changeset 2289 for code/branches/pickups2/src/orxonox/objects/pickup/Item.h

Timestamp:

Nov 26, 2008, 7:48:26 PM (17 years ago)

Author:

dsommer

Message:

Added ShipEquipment to Pawn and various funtions for it -not compiling, because private…

File:

• code/branches/pickups2/src/orxonox/objects/pickup/Item.h (modified) (2 diffs)

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

@@ -12 +12 @@
         Item( BaseObject* creator);
         virtual ~Item();
-
+        bool checkSlot(Pawn* player);
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
+        
         virtual bool pickedUp(Pawn* player) { return true; }
         virtual bool dropped(Pawn* player) { return true; } //erst bei festen Items
+        bool remove(Pawn* player);
         void addTo(Pawn* player);
 
@@ -28 +29 @@
         const std::string& getPlayerBaseClassName() const;
 
-        Identifier* playerBaseClass_; //class(...)
+        Identifier* playerBaseClass_;
         };
 }