Changeset 6992 in orxonox.OLD for trunk

Timestamp:

Feb 2, 2006, 10:55:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the StoryEntity stores the path it was loaded with, not the GameWorld

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (5 diffs)
• game_world.h (modified) (2 diffs)
• simple_game_menu.cc (modified) (1 diff)
• story_entity.cc (modified) (5 diffs)
• story_entity.h (modified) (2 diffs)

trunk/src/story_entities/game_world.cc

@@ -88 +88 @@
 
   this->dataXML = NULL;
-  this->path = NULL;
 }
 
@@ -111 +110 @@
 {
   StoryEntity::loadParams(root);
-
-  LoadParam(root, "path", this, GameWorld, setPath)
-      .describe("The Filename of this GameWorld (relative from the data-dir)");
 
   PRINTF(4)("Loaded GameWorld specific stuff\n");
@@ -145 +141 @@
   PRINTF(0)("Loading the GameWorld\n");
 
-  PRINTF(3)("> Loading world: '%s'\n", getPath());
+  PRINTF(3)("> Loading world: '%s'\n", getLoadFile());
   TiXmlElement* element;
   GameLoader* loader = GameLoader::getInstance();
 
-  if( getPath() == NULL)
+  if( getLoadFile() == NULL)
   {
     PRINTF(1)("GameWorld has no path specified for loading\n");
@@ -155 +151 @@
   }
 
-  TiXmlDocument* XMLDoc = new TiXmlDocument( getPath());
+  TiXmlDocument* XMLDoc = new TiXmlDocument( 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->getPath(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getLoadFile(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     delete XMLDoc;
     return (ErrorMessage){213,"XML File parsing error","GameWorld::load()"};
@@ -444 +440 @@
 }
 
-
-/**
- *  sets the track path of this world
- * @param name the name of the path
- */
-void GameWorld::setPath( const char* name)
-{
-  if (this->path)
-    delete this->path;
-  if (ResourceManager::isFile(name))
-  {
-    this->path = new char[strlen(name)+1];
-    strcpy(this->path, name);
-  }
-  else
-  {
-    this->path = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(name) +1];
-    sprintf(this->path, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
-  }
-}
-
-
 /**
  *  shows the loading screen

trunk/src/story_entities/game_world.h

@@ -47 +47 @@
     inline void setSpeed(float speed) { this->speed = speed; };
     /**  returns the track path of this world @returns the track path */
-    const char* getPath() { return this->path; }
-    void setPath( const char* name);
 
     /** toggles the PNode visibility in the world (drawn as boxes) */
@@ -81 +79 @@
     GameWorldData*      dataTank;                     //!< reference to the GameWorld Data Tank
     TiXmlElement*       dataXML;                      //!< The XML-Element this World has been loaded with.
-    char*               path;                         //!< The file from which this world is loaded
 
     bool                showPNodes;                   //!< if the PNodes should be visible.

trunk/src/story_entities/simple_game_menu.cc

@@ -243 +243 @@
   EventHandler::getInstance()->unsubscribe(this, ES_MENU);
 
-  std::vector<ImageEntity*>::iterator it;
   std::vector<MenuLayer>::iterator mit;
   for(mit = this->menuLayers.begin(); mit != this->menuLayers.end(); mit++)

trunk/src/story_entities/story_entity.cc

@@ -22 +22 @@
 #include "story_entity.h"
 
+#include "resource_manager.h"
 #include "load_param.h"
 
@@ -39 +40 @@
   this->isRunning = false;
 
+  this->loadFile = NULL;
   this->storyID = -1;
   this->description = NULL;
@@ -66 +68 @@
       .describe("A Unique Identifier for this StoryEntity");
 
+  LoadParam(root, "path", this, StoryEntity, setLoadFile)
+      .describe("DEPRICATED FORM OF file. The Filename of this StoryEntity (relative from the data-dir)");
+
+  LoadParam(root, "file", this, StoryEntity, setLoadFile)
+      .describe("The Filename of this StoryEntity (relative from the data-dir)");
+
   LoadParam(root, "nextid", this, StoryEntity, setNextStoryID)
       .describe("Sets the ID of the next StoryEntity");
@@ -86 +94 @@
 
 /**
+ *  sets the track path of this world
+ * @param name the name of the path
+ */
+void StoryEntity::setLoadFile(const char* fileName)
+{
+  if (this->loadFile)
+    delete this->loadFile;
+  if (ResourceManager::isFile(fileName))
+  {
+    this->loadFile = new char[strlen(fileName)+1];
+    strcpy(this->loadFile, fileName);
+  }
+  else
+    this->loadFile = ResourceManager::getFullName(fileName);
+}
+
+
+/**
  * sets the descroption of this StoryEntity
  * @param name name
@@ -101 +127 @@
 }
 
+/**
+ * sets the id of the next story entity: StoryEntities can choose their following entity themselfs.
+ * the entity id defined here  will be startet after this entity ends. this can be convenient if you
+ * want to have a non linear story with switches.
+ * @param nextStoryID the story id of the next StoryEntity
+ */
+void StoryEntity::setNextStoryID(int nextStoryID)
+{
+   this->nextStoryID = nextStoryID;
+}
 
 /**

trunk/src/story_entities/story_entity.h

@@ -60 +60 @@
   /** sets the story id of the current entity, this enables it to be identified in a  global context. @returns  the story id  */
   inline int getStoryID() { return this->storyID; }
-  /**  sets the id of the next story entity: StoryEntities can choose their following entity themselfs.
-   * the entity id defined here  will be startet after this entity ends. this can be convenient if you
-   * want to have a non linear story with switches.
-   * @param nextStoryID the story id of the next StoryEntity   */
-  inline void setNextStoryID(int nextStoryID) { this->nextStoryID = nextStoryID; }
+
+  void setLoadFile( const char* fileName);
+  /** @returns the Filename this StoryEntity was loaded with */
+  const char* getLoadFile() const { return this->loadFile; }
+
+  void setNextStoryID(int nextStoryID);
   /**  gets the story id of the current entity @returns story id */
-  inline int getNextStoryID() { return this->nextStoryID; }
+  inline int getNextStoryID() const { return this->nextStoryID; }
   inline void setDescription(const char* description);
   /** @returns the description of this StoryEntity */
   inline const char* getDescription() { return this->description; }
+
+
+
   /** toggle the menu visibility: SimpleMenu specific */
   inline void addToGameMenu(int toggle) { this->bMenuEntry = (bool)toggle; }
@@ -90 +94 @@
 
  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* 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
+    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
+
+    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
 };