Changeset 6600 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jan 18, 2006, 5:25:48 PM (19 years ago)

Author:

bensch

Message:

TRUNK: merged the avi_play branche again

Location:

trunk/src/story_entities

Files:

• Makefile.am (modified) (2 diffs)
• movie_loader.cc (copied) (copied from branches/avi_play/src/story_entities/movie_loader.cc)
• movie_loader.h (copied) (copied from branches/avi_play/src/story_entities/movie_loader.h)

trunk/src/story_entities/Makefile.am

@@ -11 +11 @@
                 story_entities/single_player_world_data.cc \
                 story_entities/multi_player_world.cc \
-                story_entities/multi_player_world_data.cc
+                story_entities/multi_player_world_data.cc \
+                story_entities/movie_loader.cc
 
 StoryEntities_HEADERS_ = \
@@ -23 +24 @@
                 story_entities/single_player_world_data.h \
                 story_entities/multi_player_world.h \
-                story_entities/multi_player_world_data.h
+                story_entities/multi_player_world_data.h \
+                story_entities/movie_loader.h