Changeset 7049 in orxonox.OLD for trunk

Timestamp:

Feb 6, 2006, 1:52:06 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the avi-play branche back

Location:

trunk/src

Files:

• story_entities/movie_loader.cc (modified) (1 diff)
• world_entities/movie_entity.cc (modified) (2 diffs)

trunk/src/story_entities/movie_loader.cc

@@ -47 +47 @@
   StoryEntity::loadParams(root);
 
-  LoadParam(root, "name", this, MovieLoader, loadMovie);
+  LoadParam(root, "movie", this, MovieLoader, loadMovie);
   LoadParam(root, "fps", this, MovieLoader, setFPS);
 }

trunk/src/world_entities/movie_entity.cc

@@ -71 +71 @@
 {
   this->fps = fps;
-PRINTF(0)("fps: %f\n", fps);
+//PRINTF(0)("fps: %f\n", fps);
 }
 
@@ -87 +87 @@
 void MovieEntity::setAxis(float axis)
 {
-PRINTF(0)("fps: %f\n", fps);
+//PRINTF(0)("fps: %f\n", fps);
   this->axis = axis;
 }