- Timestamp:
- Dec 25, 2009, 1:18:03 PM (15 years ago)
- Location:
- code/branches/pickup2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickup2
- Property svn:mergeinfo changed
-
code/branches/pickup2/src/orxonox/pickup/PickupInventory.cc
r5947 r6412 110 110 { 111 111 if(PickupInventory::getSingleton()->isVisible()) { 112 GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")"); 113 GUIManager::getInstance().executeCode("hideCursor()"); 114 InputManager::getInstance().leaveState("guiMouseOnly"); 115 } 116 else 117 { 118 GUIManager::getInstance().showGUI("PickupInventory"); 119 GUIManager::getInstance().executeCode("showCursor()"); 120 InputManager::getInstance().enterState("guiMouseOnly"); 112 GUIManager::hideGUI("PickupInventory"); 113 } 114 else 115 { 116 GUIManager::showGUI("PickupInventory"); 121 117 } 122 118 PickupInventory::getSingleton()->setVisible(!PickupInventory::getSingleton()->isVisible()); … … 235 231 return ""; 236 232 237 std::stringname = "pickup_" + item->getGUIImage();233 const std::string& name = "pickup_" + item->getGUIImage(); 238 234 239 235 if(!CEGUI::ImagesetManager::getSingletonPtr()->isImagesetPresent(name)) … … 242 238 } 243 239 244 return "set:" + name + " image:full_image";240 return ("set:" + name + " image:full_image"); 245 241 } 246 242 … … 374 370 txt->setVisible(true); 375 371 txt->setProperty("Text", item->getGUIText()); 376 txt->setProperty("TextColours", "tl:" + textColour + " tr:" + textColour + " bl:" + textColour + " br:" + textColour + "");377 378 std::stringimage = PickupInventory::getImageForItem(item);372 txt->setProperty("TextColours", "tl:" + textColour + " tr:" + textColour + " bl:" + textColour + " br:" + textColour); 373 374 const std::string& image = PickupInventory::getImageForItem(item); 379 375 btn->setVisible(true); 380 376 btn->setProperty("NormalImage", image);
Note: See TracChangeset
for help on using the changeset viewer.