Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9354 in orxonox.OLD for branches/proxy/src/story_entities


Ignore:
Timestamp:
Jul 20, 2006, 2:05:07 PM (18 years ago)
Author:
bensch
Message:

orxonox/proxy: removed simple game menu

Location:
branches/proxy/src/story_entities
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/story_entities/Makefile.am

    r8717 r9354  
    1313                story_entities/multi_player_world_data.cc \
    1414                story_entities/movie_loader.cc \
    15                 story_entities/simple_game_menu.cc \
    1615                \
    1716                story_entities/menu/game_menu.cc \
     
    3029                story_entities/multi_player_world_data.h \
    3130                story_entities/movie_loader.h \
    32                 story_entities/simple_game_menu.h \
    3331                \
    3432                story_entities/menu/game_menu.h \
  • branches/proxy/src/story_entities/game_world_data.cc

    r9235 r9354  
    194194ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root)
    195195{
     196
    196197  const TiXmlElement* element = root->FirstChildElement("WorldEntities");
     198  bool mouseCaptured = EventHandler::getInstance()->grabbedEvents();
     199  EventHandler::getInstance()->grabEvents(false);
    197200
    198201  if( element == NULL)
     
    262265  /* init the pnode tree */
    263266  PNode::getNullParent()->init();
     267
     268  EventHandler::getInstance()->grabEvents(mouseCaptured);
    264269
    265270  return ErrorMessage();
Note: See TracChangeset for help on using the changeset viewer.