Changeset 6532 in orxonox.OLD for trunk/src/world_entities/movie_entity.cc

Timestamp:

Jan 18, 2006, 1:20:02 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/movie_play to the trunk. no conflicts, but a minor virtual function BUG

File:

• trunk/src/world_entities/movie_entity.cc (copied) (copied from branches/avi_play/src/world_entities/movie_entity.cc) (2 diffs)

trunk/src/world_entities/movie_entity.cc

@@ -65 +65 @@
 void MovieEntity::loadParams(const TiXmlElement* root)
 {
-  static_cast<WorldEntity*>(this)->loadParams(root);
+  WorldEntity::loadParams(root);
 
   LoadParam(root, "name", this, MovieEntity, loadMovie);
@@ -107 +107 @@
   if(counter != fps * timer)
   {
-    counter = fps * timer;
+    counter = (int)(fps * timer);
 
     if (counter >= media_container->getFrameCount())