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

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

File:

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

trunk/src/world_entities/WorldEntities.am

@@ -1 @@
-
 ## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY
 WorldEntities_SOURCES_ = \
@@ -12 +11 @@
                 world_entities/npcs/repair_station.cc \
                 world_entities/npcs/attractor_mine.cc \
+                world_entities/npcs/actionbox_enemy.cc \
+                world_entities/npcs/adm_turret.cc \
                 \
                 \
@@ -32 +33 @@
                 world_entities/weapons/spike_thrower.cc \
                 world_entities/weapons/acid_launcher.cc \
+                world_entities/weapons/rf_cannon.cc \
+                world_entities/weapons/disruptor.cc \
+                world_entities/weapons/nadion_laser.cc \
+                world_entities/weapons/bsp_weapon.cc \
                 \
                 world_entities/projectiles/lbolt.cc \
@@ -47 +52 @@
                 world_entities/projectiles/spike.cc \
                 world_entities/projectiles/acid_splash.cc \
+                world_entities/projectiles/plasma_pulse.cc \
+                world_entities/projectiles/nadion_blast.cc \
                 \
                 world_entities/projectiles/projectile_weapon.cc \
@@ -158 +165 @@
                 npcs/repair_station.h \
                 npcs/attractor_mine.h \
+                npcs/actionbox_enemy.h \
+                npcs/adm_turret.h \
                 \
                 environments/environment.h \
@@ -196 +205 @@
                 weapons/spike_thrower.h \
                 weapons/acid_launcher.h \
+                weapons/rf_cannon.h \
+                weapons/disruptor.h \
+                weapons/nadion_laser.h \
+                weapons/bsp_weapon.h \
                 \
                 projectiles/lbolt.h \
@@ -212 +225 @@
                 projectiles/spike_ball.h \
                 projectiles/acid_splash.h \
+                projectiles/plasma_pulse.h \
+                projectiles/nadion_blast.h \
                 \
                 projectiles/projectile_weapon.h \