Changeset 7203 in orxonox.OLD for branches/std/src/story_entities/story_entity.cc

Timestamp:

Mar 9, 2006, 5:28:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles again, BUT well…. i do not expect it to run anymore

File:

• branches/std/src/story_entities/story_entity.cc (modified) (3 diffs)

branches/std/src/story_entities/story_entity.cc

@@ -40 +40 @@
   this->isRunning = false;
 
-  this->loadFile = NULL;
+  this->loadFile = "";
   this->storyID = -1;
   this->description = NULL;
@@ -100 +100 @@
  * @param name the name of the path
  */
-void StoryEntity::setLoadFile(const char* fileName)
-{
-  if (this->loadFile)
-    delete this->loadFile;
+void StoryEntity::setLoadFile(const std::string& fileName)
+{
   if (ResourceManager::isFile(fileName))
   {
-    this->loadFile = new char[strlen(fileName)+1];
-    strcpy(this->loadFile, fileName);
+    this->loadFile =  fileName;
   }
   else
@@ -149 +146 @@
 {
   PRINTF(3)("Grabbing the Worlds Settings\n", this->getLoadFile());
-  if( getLoadFile() == NULL)
-    return;
+  if( getLoadFile().empty())
+        return;
   TiXmlDocument XMLDoc(this->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->getLoadFile(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc.ErrorDesc(), this->getLoadFile().c_str(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
     return;
   }