Changeset 6993 in orxonox.OLD

Timestamp:

Feb 2, 2006, 11:23:43 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: level's LoadImage is loadable within the level instead of the Campaign file

Location:

trunk/src/story_entities

Files:

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

trunk/src/story_entities/story_entity.cc

@@ -66 +66 @@
 
   LoadParam(root, "identifier", this, StoryEntity, setStoryID)
-      .describe("A Unique Identifier for this StoryEntity");
+  .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)");
+  .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)");
+  .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");
-
-  LoadParam(root, "description", this, StoryEntity, setDescription)
-      .describe("Sets the description of this StoryEntity");
-
-  LoadParam(root, "menu-entry", this, StoryEntity, addToGameMenu)
-      .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
-
-  LoadParam(root, "menu-item-image", this, StoryEntity, setMenuItemImage)
-      .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
-
-  LoadParam(root, "screenshoot", this, StoryEntity, setMenuScreenshoot)
-      .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+  .describe("Sets the ID of the next StoryEntity");
 
   PRINTF(4)("Loaded StoryEntity specific stuff\n");
@@ -108 +96 @@
   else
     this->loadFile = ResourceManager::getFullName(fileName);
+
+  this->grabWorldInfo();
 }
 
@@ -135 +125 @@
 void StoryEntity::setNextStoryID(int nextStoryID)
 {
-   this->nextStoryID = nextStoryID;
+  this->nextStoryID = nextStoryID;
+}
+
+/**
+ * @brief grabs settings needed for displaying a MenuScreen.
+ */
+void StoryEntity::grabWorldInfo()
+{
+  PRINTF(3)("Grabbing the Worlds Settings\n", this->getLoadFile());
+  if( getLoadFile() == NULL)
+    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());
+    return;
+  }
+  TiXmlElement* root = XMLDoc.RootElement();
+  if (root == NULL)
+    return;
+
+  if (root->Value() != NULL && !strcmp(root->Value(), "WorldDataFile"))
+  {
+    LoadParam(root, "description", this, StoryEntity, setDescription)
+    .describe("Sets the description of this StoryEntity");
+
+    LoadParam(root, "menu-entry", this, StoryEntity, addToGameMenu)
+    .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+
+    LoadParam(root, "menu-item-image", this, StoryEntity, setMenuItemImage)
+    .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+
+    LoadParam(root, "screenshoot", this, StoryEntity, setMenuScreenshoot)
+    .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+  }
 }
 

trunk/src/story_entities/story_entity.h

@@ -72 +72 @@
   inline const char* getDescription() { return this->description; }
 
-
-
+  void grabWorldInfo();
   /** toggle the menu visibility: SimpleMenu specific */
-  inline void addToGameMenu(int toggle) { this->bMenuEntry = (bool)toggle; }
+  inline void addToGameMenu(bool toggle) { this->bMenuEntry = toggle; }
   /** @returns true if the GameWorld should be contained in the SimpleMenu: SimpleMenu specific */
   inline bool isContainedInMenu() { return this->bMenuEntry; }
@@ -85 +84 @@
   /** @returns the menu screenshoot of this StoryEntity */
   inline const char* getMenuScreenshoot() { return this->menuScreenshoot; }
-
 
   protected: