Changeset 9006 in orxonox.OLD for trunk/src/lib/gui

Timestamp:

Jul 2, 2006, 2:11:59 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the mountain_lake branche back to the trunk
merged with command:
svn merge -r8799:HEAD ​https://svn.orxonox.net/orxonox/branches/mountain_lake .

conflicts in script taken from the branche, since they are indentation-problems.

also fixed the delete-bug for the lightning-effect

File:

• trunk/src/lib/gui/gl/glgui_handler.cc (modified) (2 diffs)

trunk/src/lib/gui/gl/glgui_handler.cc

@@ -88 +88 @@
   void GLGuiHandler::activate()
   {
-    EventHandler::getInstance()->pushState(ES_MENU);
+    //EventHandler::getInstance()->pushState(ES_MENU);
 
 
@@ -96 +96 @@
   void GLGuiHandler::deactivate()
   {
-    EventHandler::getInstance()->popState();
+    //EventHandler::getInstance()->popState();