Changeset 7010 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Feb 3, 2006, 12:40:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged avi_play back here

Location:

trunk/src/story_entities

Files:

• movie_loader.cc (modified) (1 diff)
• movie_loader.h (modified) (1 diff)
• story_entity.cc (modified) (2 diffs)

trunk/src/story_entities/movie_loader.cc

@@ -47 +47 @@
 
   LoadParam(root, "name", this, MovieLoader, loadMovie);
+  LoadParam(root, "fps", this, MovieLoader, setFPS);
+}
+
+void MovieLoader::setFPS(float fps)
+{
+  this->movie_player->setFPS(fps);
 }
 

trunk/src/story_entities/movie_loader.h

@@ -41 +41 @@
   private:
     void loadMovie(const char* filename);
+    void setFPS(float fps);
     void tick();
     void draw() const;

trunk/src/story_entities/story_entity.cc

@@ -77 +77 @@
   .describe("Sets the ID of the next StoryEntity");
 
+  LoadParam(root, "menu-entry", this, StoryEntity, addToGameMenu)
+      .describe("If this entry is 1, the world is contained in the SimpleGameMenu");
+
+
+  LoadParam(root, "description", this, StoryEntity, setDescription)
+      .describe("Sets the description of this StoryEntity");
+
+  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");
+
   PRINTF(4)("Loaded StoryEntity specific stuff\n");
 }
@@ -152 +165 @@
     .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");