Changeset 9406 in orxonox.OLD for trunk/src/story_entities/game_world_data.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/story_entities/game_world_data.cc (modified) (6 diffs)

trunk/src/story_entities/game_world_data.cc

@@ -61 +61 @@
 
 
-using namespace std;
+
 
 
@@ -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)
@@ -209 +212 @@
       BaseObject* created = Factory::fabricate(element);
       if( created != NULL )
-        PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
+        PRINTF(4)("Created a %s: %s\n", created->getClassCName(), created->getCName());
 
       //todo do this more elegant
@@ -233 +236 @@
 
   Playable* playable;
-  const list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+  const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
   if (playableList != NULL && !playableList->empty())
   {
@@ -262 +265 @@
   /* init the pnode tree */
   PNode::getNullParent()->init();
+
+  EventHandler::getInstance()->grabEvents(mouseCaptured);
 
   return ErrorMessage();
@@ -284 +289 @@
       //    ClassList::debug( 3, CL_PARENT_NODE);
       //    PNode::getNullParent()->debugNode(0);
-      //    printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName());
+      //    printf("%s::%s\n", nodeList->front()->getClassCName(), nodeList->front()->getName());
       delete nodeList->front();
     }