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

Timestamp:

Apr 4, 2007, 12:13:53 PM (17 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/world_entities/WorldEntities.am (modified) (8 diffs)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/world_entities/WorldEntities.am

@@ -14 +14 @@
                 world_entities/npcs/mover.cc \
                 \
-                world_entities/environment.cc \
-                world_entities/skysphere.cc \
-                world_entities/skybox.cc \
-                world_entities/skydome.cc \
-                world_entities/terrain.cc \
-                world_entities/satellite.cc \
-                world_entities/movie_entity.cc \
-                world_entities/recorder.cc \
-                world_entities/character_attributes.cc \
-                world_entities/test_entity.cc \
-                world_entities/test_entity2.cc \
-                world_entities/blackscreen.cc \
-                world_entities/scrolling_screen.cc \
-                world_entities/planet.cc \
-                world_entities/bsp_entity.cc \
-                world_entities/mount_point.cc \
-                world_entities/sound_entity.cc \
-                world_entities/camera.cc \
-                \
-                world_entities/questGUI/quest_gui.cc \
-                world_entities/questGUI/quest.cc \
                 \
                 world_entities/weapons/weapon_slot.cc \
@@ -52 +31 @@
                 world_entities/weapons/heavy_blaster.cc \
                 world_entities/weapons/swarm_launcher.cc \
-                world_entities/weapons/spike_launcher.cc \
                 world_entities/weapons/spike_thrower.cc \
                 world_entities/weapons/acid_launcher.cc \
@@ -74 +52 @@
                 world_entities/projectiles/spike_ball.cc \
                 \
-                world_entities/power_ups/turret_power_up.cc \
-                world_entities/power_ups/laser_power_up.cc \
+                world_entities/items/power_ups/turret_power_up.cc \
+                world_entities/items/power_ups/laser_power_up.cc \
                 \
                 world_entities/space_ships/space_ship.cc \
@@ -92 +70 @@
                 world_entities/environments/model_entity.cc \
                 world_entities/environments/building.cc \
-                world_entities/environments/rotor.cc \
+                world_entities/environments/rotor.cc \
                 world_entities/environments/mapped_water.cc \
-                \
-                world_entities/elements/image_entity.cc \
-                world_entities/elements/text_element.cc \
-                world_entities/elements/glgui_radar.cc \
-                \
-                world_entities/effects/lightning_bolt.cc \
-                world_entities/effects/blink.cc \
-                \
-                world_entities/script_trigger.cc \
-                \
-                \
-                world_entities/particles/particle_emitter.cc \
-                world_entities/particles/dot_emitter.cc \
-                world_entities/particles/box_emitter.cc \
-                world_entities/particles/plane_emitter.cc \
-        world_entities/particles/emitter_node.cc \
-                \
-                world_entities/particles/particle_system.cc \
-                world_entities/particles/sprite_particles.cc \
-                world_entities/particles/spark_particles.cc \
-                world_entities/particles/model_particles.cc \
-                world_entities/particles/dot_particles.cc \
-                \
-                world_entities/particles/quick_animation.cc \
+                world_entities/environments/environment.cc \
+                world_entities/environments/skysphere.cc \
+                world_entities/environments/skybox.cc \
+                world_entities/environments/skydome.cc \
+                world_entities/environments/terrain.cc \
+                world_entities/environments/planet.cc \
+                world_entities/environments/bsp_entity.cc \
                 \
                 \
@@ -129 +90 @@
                 world_entities/weather_effects/snow_effect.cc \
                 world_entities/weather_effects/lightning_effect.cc \
-                world_entities/weather_effects/lense_flare.cc
+                world_entities/weather_effects/lense_flare.cc \
+                world_entities/elements/image_entity.cc \
+                \
+                world_entities/elements/text_element.cc \
+                world_entities/elements/glgui_radar.cc \
+                \
+                world_entities/effects/lightning_bolt.cc \
+                world_entities/effects/blink.cc \
+                \
+                world_entities/tools/movie_entity.cc \
+                world_entities/tools/recorder.cc \
+                world_entities/tools/blackscreen.cc \
+                world_entities/tools/scrolling_screen.cc \
+                world_entities/tools/mount_point.cc \
+                world_entities/tools/sound_entity.cc \
+                world_entities/tools/camera.cc \
+                world_entities/tools/script_trigger.cc \
+                \
+                \
+                world_entities/particles/particle_emitter.cc \
+                world_entities/particles/dot_emitter.cc \
+                world_entities/particles/box_emitter.cc \
+                world_entities/particles/plane_emitter.cc \
+                world_entities/particles/emitter_node.cc \
+                world_entities/particles/particle_system.cc \
+                world_entities/particles/sprite_particles.cc \
+                world_entities/particles/spark_particles.cc \
+                world_entities/particles/model_particles.cc \
+                world_entities/particles/dot_particles.cc \
+                world_entities/particles/quick_animation.cc \
+                \
+                \
+                \
+                world_entities/questGUI/quest_gui.cc \
+                world_entities/questGUI/quest.cc
+
 
 
@@ -147 +143 @@
                 npcs/mover.h \
                 \
-                environment.h \
-                skysphere.h \
-                skybox.h \
-                skydome.h \
-                terrain.h \
-                satellite.h \
-                movie_entity.h \
-                recorder.h \
+                environments/environment.h \
+                environments/skysphere.h \
+                environments/skybox.h \
+                environments/skydome.h \
+                environments/terrain.h \
+                tools/movie_entity.h \
+                tools/recorder.h \
                 character_attributes.h \
-                test_entity.h \
-                test_entity2.h \
-                blackscreen.h \
-                scrolling_screen.h \
-                planet.h \
-                bsp_entity.h \
-                mount_point.h \
-                sound_entity.h \
-                camera.h \
+                tools/blackscreen.h \
+                tools/scrolling_screen.h \
+                environments/planet.h \
+                environments/bsp_entity.h \
+                tools/mount_point.h \
+                tools/sound_entity.h \
+                tools/camera.h \
                 \
                 questGUI/quest_gui.h \
@@ -185 +178 @@
                 weapons/heavy_blaster.h \
                 weapons/swarm_launcher.h \
-                weapons/spike_launcher.h \
                 weapons/spike_thrower.h \
                 weapons/acid_launcher.h \
@@ -208 +200 @@
                 projectiles/spike_ball.h \
                 \
-                power_ups/turret_power_up.h \
-                power_ups/laser_power_up.h \
+                items/power_ups/turret_power_up.h \
+                items/power_ups/laser_power_up.h \
                 \
                 space_ships/space_ship.h \

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs