Changeset 6024 for code/branches/menu/src/modules/overlays

Timestamp:

Nov 4, 2009, 2:14:53 PM (15 years ago)

Author:

scheusso

Message:

merged ingamemenu branch to menu branch

Location:

code/branches/menu

Files:

• . (modified) (1 prop)
• src/modules/overlays/GUIOverlay.cc (modified) (1 diff)

code/branches/menu/src/modules/overlays/GUIOverlay.cc

@@ -72 +72 @@
             out << reinterpret_cast<long>(this);
             str = out.str();
-            GUIManager::getInstance().executeCode("showCursor()");
-            InputManager::getInstance().enterState("guiMouseOnly");
-            GUIManager::getInstance().executeCode("showGUI(\"" + this->guiName_ + "\", " + str + ")");
+            COUT(1) << "GUIManager ptr: " << str << std::endl;
+            GUIManager::getInstance().showGUIExtra(this->guiName_, str);
         }
         else
         {
-            GUIManager::getInstance().executeCode("hideGUI(\"" + this->guiName_ + "\")");
-            GUIManager::getInstance().executeCode("hideCursor()");
-            InputManager::getInstance().leaveState("guiMouseOnly");
+            GUIManager::hideGUI(this->guiName_);
         }
     }