Changeset 9354 in orxonox.OLD

Timestamp:

Jul 20, 2006, 2:05:07 PM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: removed simple game menu

Location:

branches/proxy/src

Files:

• lib/graphics/effects/lightning_effect.cc (modified) (1 diff)
• story_entities/Makefile.am (modified) (2 diffs)
• story_entities/game_world_data.cc (modified) (2 diffs)
• story_entities/simple_game_menu.cc (deleted)
• story_entities/simple_game_menu.h (deleted)

branches/proxy/src/lib/graphics/effects/lightning_effect.cc

@@ -130 +130 @@
 
     //load sound
-    if (this->thunderBuffer != NULL)
-        ResourceManager::getInstance()->unload(this->thunderBuffer);
     this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.wav", WAV);
 

branches/proxy/src/story_entities/Makefile.am

@@ -13 +13 @@
                 story_entities/multi_player_world_data.cc \
                 story_entities/movie_loader.cc \
-                story_entities/simple_game_menu.cc \
                 \
                 story_entities/menu/game_menu.cc \
@@ -30 +29 @@
                 story_entities/multi_player_world_data.h \
                 story_entities/movie_loader.h \
-                story_entities/simple_game_menu.h \
                 \
                 story_entities/menu/game_menu.h \

branches/proxy/src/story_entities/game_world_data.cc

@@ -194 +194 @@
 ErrorMessage GameWorldData::loadWorldEntities(const TiXmlElement* root)
 {
+
   const TiXmlElement* element = root->FirstChildElement("WorldEntities");
+  bool mouseCaptured = EventHandler::getInstance()->grabbedEvents();
+  EventHandler::getInstance()->grabEvents(false);
 
   if( element == NULL)
@@ -262 +265 @@
   /* init the pnode tree */
   PNode::getNullParent()->init();
+
+  EventHandler::getInstance()->grabEvents(mouseCaptured);
 
   return ErrorMessage();