Changeset 7221 in orxonox.OLD for trunk/src/story_entities/movie_loader.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/story_entities/movie_loader.h (modified) (1 diff)

trunk/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();