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

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.cc (modified) (3 diffs)

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

@@ -52 +52 @@
         this->setOwner(0);
         this->setPickupIdentifier(this->getName());
+        this->setGUIImage("");
+        this->setGUIText("");
     }
     //! Deconstructor.
@@ -68 +70 @@
 
         XMLPortParam(BaseItem, "guiText", setGUIText, getGUIText, xmlelement, mode);
-        XMLPortParam(BaseItem, "guiTooltip", setGUITooltip, getGUITooltip, xmlelement, mode);
         XMLPortParam(BaseItem, "guiImage", setGUIImage, getGUIImage, xmlelement, mode);
     }
@@ -103 +104 @@
         return true;
     }
+
+    const std::string& BaseItem::getGUIText() const { return this->guiText_; }
 }