Changeset 7211 in orxonox.OLD for branches/std/src/story_entities/simple_game_menu.cc

Timestamp:

Mar 10, 2006, 4:52:21 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new SubString class

File:

• branches/std/src/story_entities/simple_game_menu.cc (modified) (6 diffs)

branches/std/src/story_entities/simple_game_menu.cc

@@ -63 +63 @@
   this->menuSelectedIndex = 0;
 
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 
   State::setMenuID(this->getNextStoryID());
@@ -70 +71 @@
 
 /**
- *  remove the SimpleGameMenu from memory
+ *  @brief remove the SimpleGameMenu from memory
  *
  *  delete everything explicitly, that isn't contained in the parenting tree!
@@ -85 +86 @@
 
 /**
- * loads the parameters of a SimpleGameMenu from an XML-element
+ * @brief loads the parameters of a SimpleGameMenu from an XML-element
  * @param root the XML-element to load from
  */
@@ -99 +100 @@
 
 /**
- * this is executed just before load
+ * @brief this is executed just before load
  *
  * since the load function sometimes needs data, that has been initialized
@@ -125 +126 @@
 
 /**
- * load the data
+ * @brief load the data
  */
 ErrorMessage SimpleGameMenu::loadData()
@@ -265 +266 @@
 
 /**
- * start the menu
+ * @brief start the menu
  */
 bool SimpleGameMenu::start()