Changeset 9003 in orxonox.OLD for trunk/src/world_entities/WorldEntities.am

Timestamp:

Jul 2, 2006, 1:36:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

File:

• trunk/src/world_entities/WorldEntities.am (modified) (4 diffs)

trunk/src/world_entities/WorldEntities.am

@@ -5 +5 @@
                 world_entities/npcs/ground_turret.cc \
                 world_entities/npcs/generic_npc.cc \
+                world_entities/npcs/door.cc \
+                world_entities/npcs/repair_station.cc \
                 \
                 world_entities/environment.cc \
@@ -16 +18 @@
                 world_entities/character_attributes.cc \
                 world_entities/test_entity.cc \
-                world_entities/door.cc \
                 world_entities/planet.cc \
                 world_entities/bsp_entity.cc \
@@ -67 +68 @@
                 npcs/npc_test1.h \
                 npcs/ground_turret.h \
+                npcs/door.cc \
+                npcs/repair_station.cc \
+                \
                 environment.h \
                 skysphere.h \
@@ -77 +81 @@
                 character_attributes.h \
                 test_entity.h \
-                door.h \
                 planet.h \
                 bsp_entity.h \