Changeset 2972 for code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h

Timestamp:

May 11, 2009, 6:03:40 PM (15 years ago)

Author:

danielh

Message:

Update

• Minor changes in BaseItem
• Updated to NotificationQueue from trunk (compile error with old)
• Added PickupInventory for GUI handling
• Added basic support for toLua++ methods

File:

• code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h (modified) (4 diffs)

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

@@ -39 +39 @@
 #include "core/BaseObject.h"
 
+// tolua_begin
 namespace orxonox
 {
@@ -51 +52 @@
     class _OrxonoxExport BaseItem : public BaseObject
     {
+// tolua_end
     public:
         BaseItem(BaseObject* creator);
         virtual ~BaseItem();
+
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< XMLPort
 
         /**
@@ -116 +120 @@
         inline void setPickupIdentifier(const std::string& identifier)
             { this->pickupIdentifier_ = identifier; }
+
+        // GUI stuff
+        virtual const std::string& getGUIText()
+            { return this->guiText_; }
+        inline void setGUIText(const std::string& text)
+            { this->guiText_ = text; }
+
+        virtual const std::string& getGUITooltip()
+            { return this->guiTooltip_; }
+        inline void setGUITooltip(const std::string& tooltip)
+            { this->guiTooltip_ = tooltip; }
+
+        virtual const std::string& getGUIImage()
+            { return this->guiImage_; }
+        inline void setGUIImage(const std::string& image)
+            { this->guiImage_ = image; }
     private:
         Pawn* owner_;   //!< The current owner of the item.
@@ -127 +147 @@
         */
         std::string pickupIdentifier_;
+
+        std::string guiText_;
+        std::string guiTooltip_;
+        std::string guiImage_;
     };
 }