Changeset 6992 in orxonox.OLD for trunk/src/story_entities/game_world.cc

Timestamp:

Feb 2, 2006, 10:55:43 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: now the StoryEntity stores the path it was loaded with, not the GameWorld

File:

• trunk/src/story_entities/game_world.cc (modified) (5 diffs)

trunk/src/story_entities/game_world.cc

@@ -88 +88 @@
 
   this->dataXML = NULL;
-  this->path = NULL;
 }
 
@@ -111 +110 @@
 {
   StoryEntity::loadParams(root);
-
-  LoadParam(root, "path", this, GameWorld, setPath)
-      .describe("The Filename of this GameWorld (relative from the data-dir)");
 
   PRINTF(4)("Loaded GameWorld specific stuff\n");
@@ -145 +141 @@
   PRINTF(0)("Loading the GameWorld\n");
 
-  PRINTF(3)("> Loading world: '%s'\n", getPath());
+  PRINTF(3)("> Loading world: '%s'\n", getLoadFile());
   TiXmlElement* element;
   GameLoader* loader = GameLoader::getInstance();
 
-  if( getPath() == NULL)
+  if( getLoadFile() == NULL)
   {
     PRINTF(1)("GameWorld has no path specified for loading\n");
@@ -155 +151 @@
   }
 
-  TiXmlDocument* XMLDoc = new TiXmlDocument( getPath());
+  TiXmlDocument* XMLDoc = new TiXmlDocument( getLoadFile());
   // load the xml world file for further loading
   if( !XMLDoc->LoadFile())
   {
-    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getPath(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getLoadFile(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     delete XMLDoc;
     return (ErrorMessage){213,"XML File parsing error","GameWorld::load()"};
@@ -444 +440 @@
 }
 
-
-/**
- *  sets the track path of this world
- * @param name the name of the path
- */
-void GameWorld::setPath( const char* name)
-{
-  if (this->path)
-    delete this->path;
-  if (ResourceManager::isFile(name))
-  {
-    this->path = new char[strlen(name)+1];
-    strcpy(this->path, name);
-  }
-  else
-  {
-    this->path = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(name) +1];
-    sprintf(this->path, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
-  }
-}
-
-
 /**
  *  shows the loading screen