Changeset 7221 in orxonox.OLD for trunk/src/story_entities/story_entity.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

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

trunk/src/story_entities/story_entity.cc

@@ -40 +40 @@
   this->isRunning = false;
 
-  this->loadFile = NULL;
+  this->loadFile = "";
   this->storyID = -1;
-  this->description = NULL;
-  this->menuItemImage = NULL;
-  this->menuScreenshoot = NULL;
+  this->description = "";
+  this->menuItemImage = "";
+  this->menuScreenshoot = "";
   this->nextStoryID = WORLD_ID_GAMEEND;
   this->bMenuEntry = false;
@@ -100 +100 @@
  * @param name the name of the path
  */
-void StoryEntity::setLoadFile(const char* fileName)
+void StoryEntity::setLoadFile(const std::string& fileName)
 {
-  if (this->loadFile)
-    delete this->loadFile;
   if (ResourceManager::isFile(fileName))
   {
-    this->loadFile = new char[strlen(fileName)+1];
-    strcpy(this->loadFile, fileName);
+    this->loadFile =  fileName;
   }
   else
@@ -120 +117 @@
  * @param name name
  */
-void StoryEntity::setDescription(const char* description)
+void StoryEntity::setDescription(const std::string& description)
 {
-  if (this->description)
-    delete[] this->description;
-  if (description!= NULL)
-  {
-    this->description= new char[strlen(description)+1];
-    strcpy(this->description, description);
-  }
-  else this->description= NULL;
+  this->description = description;
 }
 
@@ -149 +139 @@
 {
   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;
   }
@@ -181 +171 @@
  * @param name name
  */
-void StoryEntity::setMenuItemImage(const char* image)
+void StoryEntity::setMenuItemImage(const std::string& image)
 {
-  if (this->menuItemImage)
-    delete[] this->menuItemImage;
-  if (image != NULL)
-  {
-    this->menuItemImage = new char[strlen(image)+1];
-    strcpy(this->menuItemImage, image);
-  }
-  else this->menuItemImage = NULL;
+  this->menuItemImage = image;
 }
 
 
-/** sets the menu screenshoot of this StoryEntity @param name name */
-void StoryEntity::setMenuScreenshoot(const char* image)
+/** sets the menu screenshoot of this StoryEntity
+ * @param name name
+ */
+void StoryEntity::setMenuScreenshoot(const std::string& image)
 {
-  if (this->menuScreenshoot)
-    delete[] this->menuScreenshoot;
-  if (image != NULL)
-  {
-    this->menuScreenshoot = new char[strlen(image)+1];
-    strcpy(this->menuScreenshoot, image);
-  }
-  else this->menuScreenshoot = NULL;
+  this->menuScreenshoot = image;
 }