Changeset 6570 in orxonox.OLD

Timestamp:

Jan 18, 2006, 3:28:46 PM (18 years ago)

Author:

stefalie

Message:

branches/avi_play: …

Location:

branches/avi_play/src/story_entities

Files:

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

branches/avi_play/src/story_entities/movie_loader.cc

@@ -15 +15 @@
 
 #include "movie_loader.h"
-
+#include "movie_player.h"
 #include "resource_manager.h"
 
@@ -92 +92 @@
     this->tick();
 
-    movie_player>draw();
+    movie_player->draw();
   }
 }
@@ -109 +109 @@
   this->dt = currentFrame - this->lastFrame;
   // calculate time difference in seconds (float)
-  this->dtS = (float)this->dt / 1000.0f;
+  this->dts = (float)this->dt / 1000.0f;
 
   movie_player->tick(dts);

branches/avi_play/src/story_entities/movie_loader.h

@@ -10 +10 @@
 #include "story_entity.h"
 
+class MoviePlayer;
 
 class MovieLoader : public StoryEntity
@@ -35 +36 @@
     void tick();
 
+
+    MoviePlayer*        movie_player;
     Uint32              lastFrame;                    // last time of frame
     Uint32              dt;                           // time needed to calculate this frame (in milliSeconds)
-    float               dtS;
+    float               dts;
 };