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

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.h (copied) (copied from branches/avi_play/src/world_entities/movie_entity.h) (1 diff)

trunk/src/world_entities/movie_entity.h

@@ -35 +35 @@
     virtual void tick (float time);
 
-    void loadParams(const TiXmlElement* root);
+    virtual void loadParams(const TiXmlElement* root);
 
     void loadMovie(const char* filename);