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

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 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.h (modified) (2 diffs)

trunk/src/story_entities/story_entity.h

@@ -61 +61 @@
   inline int getStoryID() { return this->storyID; }
 
-  void setLoadFile( const char* fileName);
+  void setLoadFile(const std::string& fileName);
   /** @returns the Filename this StoryEntity was loaded with */
-  const char* getLoadFile() const { return this->loadFile; }
+  const std::string& getLoadFile() const { return this->loadFile; }
 
   void setNextStoryID(int nextStoryID);
   /**  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:
-    bool isInit;            //!< if the entity is initialized, this has to be true.
-    bool isRunning;         //!< is true if the entity is running
-    bool isPaused;          //!< is true if the entity is paused
+    bool          isInit;            //!< if the entity is initialized, this has to be true.
+    bool          isRunning;         //!< is true if the entity is running
+    bool          isPaused;          //!< is true if the entity is paused
 
 
  private:
-    int     storyID;          //!< this is the number of this entity, identifying it in a list/tree...
-    int     nextStoryID;      //!< if this entity has finished, this entity shall be called
-    char*   loadFile;         //!< The file from which this world is loaded
+    int           storyID;          //!< this is the number of this entity, identifying it in a list/tree...
+    int           nextStoryID;      //!< if this entity has finished, this entity shall be called
+    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
-    bool    bMenuEntry;       //!< If true, this GameWorld apears in the SimpleMenu: SimpleMenu specific
+    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
 };