Changeset 6488 in orxonox.OLD

Timestamp:

Jan 11, 2006, 4:33:14 PM (18 years ago)

Author:

stefalie

Message:

avi_play_merge: movie_entity added

Location:

branches/avi_play_merge/src

Files:

• defs/class_id.h (modified) (2 diffs)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/movie_entity.cc (added)
• world_entities/movie_entity.h (added)

branches/avi_play_merge/src/defs/class_id.h

@@ -189 +189 @@
   CL_GROUND_TURRET              =    0x00000244,
   CL_GUIDED_MISSILE             =    0x00000245,
+  CL_MOVIE_ENTITY               =    0x00000246,
 
   CL_NPC_TEST1                  =    0x00000301,
@@ -226 +227 @@
   CL_TEXTURE_SEQUENCE           =    0x00004805,
   CL_OBJ_MODEL                  =    0x00000807,
-  
+
   CL_MOVIE_PLAYER               =    0x00000805,
   CL_MEDIA_CONTAINER            =    0x00000806,

branches/avi_play_merge/src/world_entities/Makefile.am

@@ -20 +20 @@
                   world_entities/terrain.cc \
                   world_entities/satellite.cc \
+                  world_entities/movie_entity.cc \
                   world_entities/character_attributes.cc \
                   world_entities/test_entity.cc \
@@ -68 +69 @@
                  world_entities/terrain.h \
                  world_entities/satellite.h \
+                 world_entities/movie_entity.h \
                  world_entities/character_attributes.h \
                  world_entities/test_entity.h \