Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/story_entities/world.h

Timestamp:

May 24, 2005, 10:32:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

File:

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

orxonox/branches/physics/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
@@ -57 +57 @@
   World (char* name);
   World (int worldID);
-  World (TiXmlElement* root);
+  World (const TiXmlElement* root = NULL);
   virtual ~World ();
+
+  void loadParams(const TiXmlElement* root);
 
   double getGameTime();