Changeset 6417 for code/trunk/src/orxonox/pickup/PickupInventory.cc
- Timestamp:
- Dec 25, 2009, 10:23:58 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/pickup/PickupInventory.cc
r5781 r6417 86 86 { 87 87 if(PickupInventory::getSingleton()->isVisible()) { 88 GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")"); 89 GUIManager::getInstance().executeCode("hideCursor()"); 90 InputManager::getInstance().leaveState("guiMouseOnly"); 91 } 92 else 93 { 94 GUIManager::getInstance().showGUI("PickupInventory"); 95 GUIManager::getInstance().executeCode("showCursor()"); 96 InputManager::getInstance().enterState("guiMouseOnly"); 88 GUIManager::hideGUI("PickupInventory"); 89 } 90 else 91 { 92 GUIManager::showGUI("PickupInventory"); 97 93 } 98 94 PickupInventory::getSingleton()->setVisible(!PickupInventory::getSingleton()->isVisible()); … … 200 196 return ""; 201 197 202 std::stringname = "pickup_" + item->getGUIImage();198 const std::string& name = "pickup_" + item->getGUIImage(); 203 199 204 200 if(!CEGUI::ImagesetManager::getSingletonPtr()->isImagesetPresent(name)) … … 207 203 } 208 204 209 return "set:" + name + " image:full_image";205 return ("set:" + name + " image:full_image"); 210 206 } 211 207 … … 336 332 txt->setVisible(true); 337 333 txt->setProperty("Text", item->getGUIText()); 338 txt->setProperty("TextColours", "tl:" + textColour + " tr:" + textColour + " bl:" + textColour + " br:" + textColour + "");339 340 std::stringimage = PickupInventory::getImageForItem(item);334 txt->setProperty("TextColours", "tl:" + textColour + " tr:" + textColour + " bl:" + textColour + " br:" + textColour); 335 336 const std::string& image = PickupInventory::getImageForItem(item); 341 337 btn->setVisible(true); 342 338 btn->setProperty("NormalImage", image);
Note: See TracChangeset
for help on using the changeset viewer.