Changeset 4261 in orxonox.OLD for orxonox/trunk/src/story_entities/world.h

Timestamp:

May 22, 2005, 3:19:57 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the levelLoader-branche back into the trunk, because it seems to be stable.
merged with command:
svn merge -r 4230:HEAD levelLoader ../trunk
no conflicts of any interesst

File:

• orxonox/trunk/src/story_entities/world.h (modified) (3 diffs)

orxonox/trunk/src/story_entities/world.h

@@ -11 +11 @@
 #include "story_entity.h"
 #include "p_node.h"
-#include "xmlparser/tinyxml.h"
 
 class World;
@@ -24 +23 @@
 class GarbageCollector;
 class Text;
+class TiXmlElement;
 
 //! The game world Interface
@@ -56 +56 @@
   World (char* name);
   World (int worldID);
-  World (TiXmlElement* root);
+  World (const TiXmlElement* root = NULL);
   virtual ~World ();
+
+  void loadParams(const TiXmlElement* root);
 
   double getGameTime();