Changeset 3279 for code/branches/core4/src/orxonox/objects/pickup/PickupInventory.cc

Timestamp:

Jul 12, 2009, 11:08:50 PM (15 years ago)

Author:

rgrieder

Message:

Heavy clean up in the InputManager; not many real code changes though.
And temporary hack-fixed a problem in the Keybinder with std::vector.reserve(1000)

File:

• code/branches/core4/src/orxonox/objects/pickup/PickupInventory.cc (modified) (2 diffs)

code/branches/core4/src/orxonox/objects/pickup/PickupInventory.cc

@@ -88 +88 @@
             GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
             GUIManager::getInstance().executeCode("hideCursor()");
-            InputManager::getInstance().requestLeaveState("guiMouseOnly");
+            InputManager::getInstance().leaveState("guiMouseOnly");
         }
         else
@@ -94 +94 @@
             GUIManager::getInstance().showGUI("PickupInventory");
             GUIManager::getInstance().executeCode("showCursor()");
-            InputManager::getInstance().requestEnterState("guiMouseOnly");
+            InputManager::getInstance().enterState("guiMouseOnly");
         }
         PickupInventory::getSingleton()->setVisible(!PickupInventory::getSingleton()->isVisible());