Changeset 7287 in orxonox.OLD for trunk/src/story_entities/game_world_data.h

Timestamp:

Apr 13, 2006, 10:41:48 PM (18 years ago)

Author:

bensch

Message:

merged back with:
svn merge . . -rHEAD:PREV

File:

• trunk/src/story_entities/game_world_data.h (modified) (2 diffs)

trunk/src/story_entities/game_world_data.h

@@ -38 +38 @@
 
     virtual ErrorMessage init();
-    virtual ErrorMessage loadData(const TiXmlElement* root);
+    virtual ErrorMessage loadData(TiXmlElement* root);
     virtual ErrorMessage unloadData();
 
@@ -46 +46 @@
 
   protected:
-    virtual ErrorMessage loadGUI(const TiXmlElement* root);
-    virtual ErrorMessage loadWorldEntities(const TiXmlElement* root);
-    virtual ErrorMessage loadScene(const TiXmlElement* root);
+    virtual ErrorMessage loadGUI(TiXmlElement* root);
+    virtual ErrorMessage loadWorldEntities(TiXmlElement* root);
+    virtual ErrorMessage loadScene(TiXmlElement* root);
 
     virtual ErrorMessage unloadGUI();