Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/gui/gl/glgui_handler.cc

    r8743 r9006  
    8888  void GLGuiHandler::activate()
    8989  {
    90     EventHandler::getInstance()->pushState(ES_MENU);
     90    //EventHandler::getInstance()->pushState(ES_MENU);
    9191
    9292
     
    9696  void GLGuiHandler::deactivate()
    9797  {
    98     EventHandler::getInstance()->popState();
     98    //EventHandler::getInstance()->popState();
    9999
    100100
Note: See TracChangeset for help on using the changeset viewer.