Changeset 6166 in orxonox.OLD

Timestamp:

Dec 19, 2005, 10:19:28 PM (18 years ago)

Author:

patrick

Message:

christmas: added some new model class

Location:

branches/christmas_branche/src

Files:

• defs/class_id.h (modified) (1 diff)
• world_entities/Makefile.am (modified) (5 diffs)
• world_entities/creatures (added)
• world_entities/creatures/md2_creature.cc (added)
• world_entities/creatures/md2_creature.h (added)

branches/christmas_branche/src/defs/class_id.h

@@ -149 +149 @@
   CL_SPACE_SHIP                 =    0x0000020a,
   CL_HELICOPTER                 =    0x0000020b,
-  CL_SPAWNING_POINT             =    0x0000020b,
+  CL_SPAWNING_POINT             =    0x0000020c,
+  CL_MD2_CREATURE               =    0x0000020d,
 
   CL_TURRET_POWER_UP            =    0x00000211,

branches/christmas_branche/src/world_entities/Makefile.am

@@ -8 +8 @@
                   camera.cc \
                   playable.cc \
-                              player.cc \
+                  player.cc \
                   npc.cc \
                   npc2.cc \
@@ -18 +18 @@
                   character_attributes.cc \
                   test_entity.cc \
-                              space_ships/space_ship.cc \
+                  space_ships/space_ship.cc \
+                  creatures/md2_creature.cc \
                   weapons/weapon_manager.cc \
                   weapons/weapon.cc \
@@ -27 +28 @@
                   weapons/rocket.cc \
                   weapons/laser.cc \
-                              weapons/ground_turret.cc \
+                  weapons/ground_turret.cc \
                   weapons/crosshair.cc \
-                              weapons/ground_turret.cc \
+                  weapons/ground_turret.cc \
                   power_ups/power_up.cc \
                   power_ups/turret_power_up.cc \
@@ -38 +39 @@
                  camera.h \
                  playable.h \
-                             player.h \
+                 player.h \
                  npc.h \
                  npc2.h \
@@ -49 +50 @@
                  test_entity.h \
                  space_ships/space_ship.h \
+                 creatures/md2_creature.h \
                  weapons/weapon_manager.h \
                  weapons/weapon.h \