Changeset 3157 for code/branches/pch/src/orxonox/objects/pickup

Timestamp:

Jun 13, 2009, 5:03:51 PM (16 years ago)

Author:

rgrieder

Message:

Small changes and cleaned out RadarViewable which saves me probably more than a minute when recompiling…

Location:

code/branches/pch/src/orxonox/objects/pickup

Files:

• PickupInventory.cc (modified) (1 diff)
• PickupSpawner.cc (modified) (1 diff)

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

@@ -86 +86 @@
     {
         if(PickupInventory::getSingleton()->isVisible()) {
-            GUIManager::getInstancePtr()->executeCode("hideGUI(\"PickupInventory\")");
-            GUIManager::getInstancePtr()->executeCode("hideCursor()");
+            GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
+            GUIManager::getInstance().executeCode("hideCursor()");
             InputManager::getInstance().requestLeaveState("guiMouseOnly");
         }
         else
         {
-            GUIManager::getInstancePtr()->showGUI("PickupInventory");
-            GUIManager::getInstancePtr()->executeCode("showCursor()");
+            GUIManager::getInstance().showGUI("PickupInventory");
+            GUIManager::getInstance().executeCode("showCursor()");
             InputManager::getInstance().requestEnterState("guiMouseOnly");
         }

code/branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -95 +95 @@
         //  & load the GUI itself too, along with some empty windows
         //   = even less delays
-        GUIManager::getInstancePtr()->showGUI("PickupInventory");
-        GUIManager::getInstancePtr()->executeCode("hideGUI(\"PickupInventory\")");
+        GUIManager::getInstance().showGUI("PickupInventory");
+        GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
         PickupInventory::getSingleton();
     }