Changeset 7214 in orxonox.OLD for branches/std/src/story_entities

Timestamp:

Mar 10, 2006, 7:18:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the branche works again, as it did before

Location:

branches/std/src/story_entities

Files:

• story_entity.cc (modified) (3 diffs)
• story_entity.h (modified) (3 diffs)

branches/std/src/story_entities/story_entity.cc

@@ -42 +42 @@
   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;
@@ -117 +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;
 }
 
@@ -178 +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;
 }
 

branches/std/src/story_entities/story_entity.h

@@ -68 +68 @@
   /**  gets the story id of the current entity @returns story id */
   inline int getNextStoryID() const { return this->nextStoryID; }
-  inline void setDescription(const char* description);
+  inline void setDescription(const std::string& description);
   /** @returns the description of this StoryEntity */
-  inline const char* getDescription() { return this->description; }
+  inline const std::string& getDescription() { return this->description; }
 
   void grabWorldInfo();
@@ -78 +78 @@
   inline bool isContainedInMenu() { return this->bMenuEntry; }
   /** sets the menu item image of this StoryEntity @param name name */
-  inline void setMenuItemImage(const char* image);
+  inline void setMenuItemImage(const std::string& image);
   /** @returns the menu item image of this StoryEntity */
-  inline const char* getMenuItemImage() { return this->menuItemImage; }
-  inline void setMenuScreenshoot(const char* image);
+  inline const std::string& getMenuItemImage() { return this->menuItemImage; }
+  inline void setMenuScreenshoot(const std::string& image);
   /** @returns the menu screenshoot of this StoryEntity */
-  inline const char* getMenuScreenshoot() { return this->menuScreenshoot; }
+  inline const std::string& getMenuScreenshoot() { return this->menuScreenshoot; }
 
   protected:
@@ -96 +96 @@
     std::string   loadFile;         //!< The file from which this world is loaded
 
-    char*         description;      //!< the description of the StoryEntity
-    char*         menuItemImage;    //!< the item image of the StoryEntity
-    char*         menuScreenshoot;  //!< the screenshoot of the StoryEntity
+    std::string   description;      //!< the description of the StoryEntity
+    std::string   menuItemImage;    //!< the item image of the StoryEntity
+    std::string   menuScreenshoot;  //!< the screenshoot of the StoryEntity
     bool          bMenuEntry;       //!< If true, this GameWorld apears in the SimpleMenu: SimpleMenu specific
 };