Changeset 7208 in orxonox.OLD for branches/std/src/story_entities

Timestamp:

Mar 10, 2006, 1:56:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/std: less evil

Location:

branches/std/src/story_entities

Files:

• movie_loader.cc (modified) (4 diffs)
• movie_loader.h (modified) (1 diff)

branches/std/src/story_entities/movie_loader.cc

@@ -36 +36 @@
 }
 
-MovieLoader::~MovieLoader() 
+MovieLoader::~MovieLoader()
 {
   delete this->movie_player;
@@ -56 +56 @@
 }
 
-void MovieLoader::loadMovie(const char* filename)
+void MovieLoader::loadMovie(const std::string& filename)
 {
   movie_player->loadMovie(filename);
@@ -78 +78 @@
 
   this->movie_player->start(0);
-  
+
   this->isRunning = true;
   this->run();
@@ -139 +139 @@
 
   // calculate time difference in milliseconds (Uint32)
-  this->dt = currentFrame - this->lastFrame; 
+  this->dt = currentFrame - this->lastFrame;
   // calculate time difference in seconds (float)
   this->dts = (float)this->dt / 1000.0f;

branches/std/src/story_entities/movie_loader.h

@@ -43 +43 @@
 
   private:
-    void loadMovie(const char* filename);
+    void loadMovie(const std::string& filename);
     void setFPS(float fps);
     void tick();