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

Timestamp:

May 20, 2009, 9:01:17 PM (16 years ago)

Author:

danielh

Message:

• Added helper method to HumanController to get it's ControllableEntity as a Pawn
• Removed tooltip, added default (empty) values for text and image from BaseItem
• Fixed tolua in BaseItem.h
• Added object to PickupCollection for the current UsableItem
• Moved most inventory logic from Lua to PickupInventory (still slow)

TODO

• Re-use of CEGUI item windows, destroying and creating them on each update is slow, very slow

File:

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

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

@@ -50 +50 @@
             Daniel 'Huty' Haggenmueller
     */
-    class _OrxonoxExport BaseItem : public BaseObject
+    class _OrxonoxExport BaseItem
+// tolua_end
+        : public BaseObject
+// tolua_begin
     {
 // tolua_end
@@ -122 +125 @@
 
         // GUI stuff
-        virtual const std::string& getGUIText()
-            { return this->guiText_; }
+        virtual const std::string& getGUIText() const; // tolua_export
         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()
+        virtual const std::string& getGUIImage() const
             { return this->guiImage_; }
         inline void setGUIImage(const std::string& image)
@@ -149 +146 @@
 
         std::string guiText_;
-        std::string guiTooltip_;
         std::string guiImage_;
-    };
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _BaseItem_H__ */