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

Timestamp:

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

Author:

bensch

Message:

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

Location:

branches/std/src/story_entities

Files:

• game_world.cc (modified) (2 diffs)
• game_world_data.cc (modified) (3 diffs)
• story_entity.cc (modified) (3 diffs)
• story_entity.h (modified) (2 diffs)

branches/std/src/story_entities/game_world.cc

@@ -145 +145 @@
   GameLoader* loader = GameLoader::getInstance();
 
-  if( getLoadFile() == NULL)
+  if( getLoadFile().empty())
   {
     PRINTF(1)("GameWorld has no path specified for loading\n");
@@ -155 +155 @@
   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());
     delete XMLDoc;
     return (ErrorMessage){213,"XML File parsing error","GameWorld::load()"};

branches/std/src/story_entities/game_world_data.cc

@@ -129 +129 @@
   // load the parameters
   // name
-  const char* string = grabParameter( root, "name");
-  if( string == NULL)
+  std::string string = grabParameter( root, "name");
+  if( string.empty() )
   {
     PRINTF(2)("GameWorld is missing a proper 'name'\n");
@@ -136 +136 @@
   }
   else
-    this->setName(string);
+    this->setName(string.c_str());
 
   this->loadGUI(root);
@@ -363 +363 @@
   {
     PRINTF(3)("Setting Sound Track to %s\n", name);
-    char* oggFile = ResourceManager::getFullName(name); /// FIXME
+    std::string oggFile = ResourceManager::getFullName(name);
     this->music = new OggPlayer(oggFile);
-    delete[] oggFile;
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);

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;
   }

branches/std/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);
@@ -86 +86 @@
 
   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
+    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
 };