Changeset 7221 in orxonox.OLD for trunk/src/world_entities/movie_entity.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/world_entities/movie_entity.h (modified) (1 diff)

trunk/src/world_entities/movie_entity.h

@@ -37 +37 @@
     virtual void loadParams(const TiXmlElement* root);
 
-    void loadMovie(const char* filename);
+    void loadMovie(const std::string& filename);
     void setAxis(float axis);
     void setRotation(float rotation);