Changeset 7370 in orxonox.OLD for trunk/src/story_entities/simple_game_menu.cc

Timestamp:

Apr 26, 2006, 1:31:01 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: drawLists/tickLists are used, and made some TiXmlElement to const TiXmlElement, also fixed some bugs in the loadWorldEntities-functions from Gameworld and SipleGameMenu

File:

• trunk/src/story_entities/simple_game_menu.cc (modified) (9 diffs)

trunk/src/story_entities/simple_game_menu.cc

@@ -253 +253 @@
 ErrorMessage SimpleGameMenu::unloadData()
 {
-
   EventHandler::getInstance()->unsubscribe(this, ES_MENU);
 
@@ -316 +315 @@
 
 /**
- *  no collision detection in the menu
+ * @brief no collision detection in the menu
  */
 void SimpleGameMenu::collide()
@@ -325 +324 @@
 
 /**
- *  animate the scene
+ * @brief animate the scene
  */
 void SimpleGameMenu::animateScene(float dt)
@@ -337 +336 @@
 
 /**
- * event dispatcher funciton
+ * @brief event dispatcher funciton
  * @param event the incoming event
  */
@@ -515 +514 @@
  * @param root reference to the xml root element
  */
-ErrorMessage SimpleGameMenuData::loadGUI(TiXmlElement* root)
+ErrorMessage SimpleGameMenuData::loadGUI(const TiXmlElement* root)
 {
   /* call underlying function */
@@ -536 +535 @@
  * @param root reference to the xml root parameter
  */
-ErrorMessage SimpleGameMenuData::loadWorldEntities(TiXmlElement* root)
-{
-  TiXmlElement* element = root->FirstChildElement("WorldEntities");
+ErrorMessage SimpleGameMenuData::loadWorldEntities(const TiXmlElement* root)
+{
+  GameWorldData::loadWorldEntities(root);
+  /*
+  const TiXmlElement* element = root->FirstChildElement("WorldEntities");
 
   if( element != NULL)
@@ -544 +545 @@
     element = element->FirstChildElement();
     PRINTF(4)("Loading WorldEntities\n");
-    while( element != NULL)
+    while(element != NULL)
     {
       BaseObject* created = Factory::fabricate(element);
@@ -550 +551 @@
         printf("Created a %s: %s\n", created->getClassName(), created->getName());
 
-      if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))
+      if( element->Value() == "SkyBox")
         this->sky = dynamic_cast<WorldEntity*>(created);
-      if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
+      if( element->Value() == "Terrain")
         this->terrain = dynamic_cast<Terrain*>(created);
       element = element->NextSiblingElement();
     }
+
     PRINTF(4)("Done loading WorldEntities\n");
   }
 
-  /* init the pnode tree */
+  // init the pnode tree
   PNode::getNullParent()->init();
+  */
 }
 
@@ -578 +581 @@
  * @param root reference to the xml root element
  */
-ErrorMessage SimpleGameMenuData::loadScene(TiXmlElement* root)
+ErrorMessage SimpleGameMenuData::loadScene(const TiXmlElement* root)
 {
   /* call underlying function */