Changeset 6432 in orxonox.OLD
- Timestamp:
- Jan 8, 2006, 1:15:52 AM (18 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
- 1 copied
- 2 moved
-
Makefile.am (modified) (3 diffs)
-
story_entities/Makefile.am (copied) (copied from trunk/src/world_entities/Makefile.am) (1 diff)
-
world_entities/Makefile.am (modified) (1 diff)
-
world_entities/npcs/ground_turret.cc (moved) (moved from trunk/src/world_entities/weapons/ground_turret.cc) (1 diff)
-
world_entities/npcs/ground_turret.h (moved) (moved from trunk/src/world_entities/weapons/ground_turret.h)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile.am
r6426 r6432 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 include world_entities/Makefile.am 5 include story_entities/Makefile.am 4 6 5 7 #"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include" 6 7 8 8 9 bin_PROGRAMS = orxonox … … 10 11 orxonox_CPPFLAGS = -DIS_ORXONOX 11 12 12 orxonox_DEPENDENCIES = lib/libORXlibs.a \ 13 util/libORXutils.a \ 14 lib/gui/gtk_gui/libORXgui.a \ 15 lib/graphics/importer/libORXimporter.a \ 16 lib/graphics/libORXgraphics.a \ 17 lib/sound/libORXsound.a \ 18 lib/event/libORXevent.a \ 19 lib/physics/libORXphysics.a \ 20 lib/particles/libORXparticles.a \ 21 lib/collision_detection/libORXcd.a \ 22 lib/graphics/spatial_separation/libORXquadtree.a \ 23 lib/parser/tinyxml/libtinyxml.a \ 24 lib/parser/ini_parser/libIniParser.a \ 25 lib/gui/gl_gui/libORXglgui.a \ 26 lib/shell/libORXshell.a \ 27 lib/network/libORXnet.a 13 orxonox_DEPENDENCIES = \ 14 lib/libORXlibs.a \ 15 util/libORXutils.a \ 16 lib/gui/gtk_gui/libORXgui.a \ 17 lib/graphics/importer/libORXimporter.a \ 18 lib/graphics/libORXgraphics.a \ 19 lib/sound/libORXsound.a \ 20 lib/event/libORXevent.a \ 21 lib/physics/libORXphysics.a \ 22 lib/particles/libORXparticles.a \ 23 lib/collision_detection/libORXcd.a \ 24 lib/graphics/spatial_separation/libORXquadtree.a \ 25 lib/parser/tinyxml/libtinyxml.a \ 26 lib/parser/ini_parser/libIniParser.a \ 27 lib/gui/gl_gui/libORXglgui.a \ 28 lib/shell/libORXshell.a \ 29 lib/network/libORXnet.a 28 30 29 31 orxonox_LDADD = util/libORXutils.a \ 30 lib/collision_detection/libORXcd.a \ 31 lib/libORXlibs.a \ 32 lib/gui/gtk_gui/libORXgui.a \ 33 lib/graphics/importer/libORXimporter.a \ 34 lib/graphics/libORXgraphics.a \ 35 lib/sound/libORXsound.a \ 36 lib/event/libORXevent.a \ 37 lib/physics/libORXphysics.a \ 38 lib/particles/libORXparticles.a \ 39 lib/graphics/spatial_separation/libORXquadtree.a \ 40 lib/parser/tinyxml/libtinyxml.a \ 41 lib/parser/ini_parser/libIniParser.a \ 42 lib/gui/gl_gui/libORXglgui.a \ 43 lib/shell/libORXshell.a \ 44 lib/network/libORXnet.a \ 45 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 32 \ 33 lib/collision_detection/libORXcd.a \ 34 \ 35 lib/libORXlibs.a \ 36 lib/gui/gtk_gui/libORXgui.a \ 37 lib/graphics/importer/libORXimporter.a \ 38 lib/graphics/libORXgraphics.a \ 39 lib/sound/libORXsound.a \ 40 lib/event/libORXevent.a \ 41 lib/physics/libORXphysics.a \ 42 lib/particles/libORXparticles.a \ 43 lib/graphics/spatial_separation/libORXquadtree.a \ 44 lib/parser/tinyxml/libtinyxml.a \ 45 lib/parser/ini_parser/libIniParser.a \ 46 lib/gui/gl_gui/libORXglgui.a \ 47 lib/shell/libORXshell.a \ 48 lib/network/libORXnet.a \ 49 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 46 50 47 orxonox_SOURCES = orxonox.cc \ 48 story_entities/story_entity.cc \ 49 story_entities/campaign.cc \ 50 story_entities/campaign_data.cc \ 51 story_entities/game_world.cc \ 52 story_entities/game_world_data.cc \ 53 story_entities/single_player_world.cc \ 54 story_entities/single_player_world_data.cc \ 55 story_entities/multi_player_world.cc \ 56 story_entities/multi_player_world_data.cc \ 57 world_entities/world_entity.cc \ 58 world_entities/camera.cc \ 59 world_entities/playable.cc \ 60 world_entities/player.cc \ 61 world_entities/npcs/npc.cc \ 62 world_entities/npcs/npc_test1.cc \ 63 world_entities/npcs/npc_test.cc \ 64 world_entities/environment.cc \ 65 world_entities/skysphere.cc \ 66 world_entities/skybox.cc \ 67 world_entities/terrain.cc \ 68 world_entities/satellite.cc \ 69 world_entities/character_attributes.cc \ 70 world_entities/test_entity.cc \ 71 world_entities/weapons/weapon_manager.cc \ 72 world_entities/weapons/weapon.cc \ 73 world_entities/weapons/projectile.cc \ 74 world_entities/weapons/test_gun.cc \ 75 world_entities/weapons/turret.cc \ 76 world_entities/weapons/ground_turret.cc \ 77 world_entities/weapons/aiming_turret.cc \ 78 world_entities/weapons/targeting_turret.cc \ 79 world_entities/weapons/cannon.cc \ 80 world_entities/weapons/test_bullet.cc \ 81 world_entities/weapons/rocket.cc \ 82 world_entities/weapons/guided_missile.cc \ 83 world_entities/weapons/laser.cc \ 84 world_entities/weapons/aim.cc \ 85 world_entities/weapons/bomb.cc \ 86 world_entities/weapons/crosshair.cc \ 87 world_entities/power_ups/power_up.cc \ 88 world_entities/power_ups/turret_power_up.cc \ 89 world_entities/power_ups/laser_power_up.cc \ 90 world_entities/power_ups/weapon_power_up.cc \ 91 world_entities/power_ups/param_power_up.cc \ 92 world_entities/space_ships/space_ship.cc \ 93 world_entities/space_ships/helicopter.cc \ 94 world_entities/creatures/md2_creature.cc \ 95 world_entities/spawning_point.cc \ 96 subprojects/benchmark.cc 51 orxonox_SOURCES = \ 52 $(WorldEntities_SOURCES_) \ 53 $(StoryEntities_SOURCES_) \ 54 orxonox.cc \ 55 subprojects/benchmark.cc 97 56 98 noinst_HEADERS = orxonox.h \ 99 ability.h \ 100 defs/message_structures.h \ 101 story_entities/story_entity.h \ 102 story_entities/story_def.h \ 103 story_entities/campaign.h \ 104 story_entities/campaign_data.h \ 105 story_entities/game_world.h \ 106 story_entities/game_world_data.h \ 107 story_entities/single_player_world.h \ 108 story_entities/single_player_world_data.h \ 109 story_entities/multi_player_world.h \ 110 story_entities/multi_player_world_data.h \ 111 world_entities/world_entity.h \ 112 world_entities/camera.h \ 113 world_entities/extendable.h \ 114 world_entities/playable.h \ 115 world_entities/player.h \ 116 world_entities/npcs/npc.h \ 117 world_entities/npcs/npc_test.h \ 118 world_entities/npcs/npc_test1.h \ 119 world_entities/environment.h \ 120 world_entities/skysphere.h \ 121 world_entities/skybox.h \ 122 world_entities/terrain.h \ 123 world_entities/satellite.h \ 124 world_entities/character_attributes.h \ 125 world_entities/test_entity.h \ 126 world_entities/weapons/weapon_manager.h \ 127 world_entities/weapons/weapon.h \ 128 world_entities/weapons/projectile.h \ 129 world_entities/weapons/test_gun.h \ 130 world_entities/weapons/cannon.h \ 131 world_entities/weapons/turret.h \ 132 world_entities/weapons/aiming_turret.h \ 133 world_entities/weapons/targeting_turret.h \ 134 world_entities/weapons/test_bullet.h \ 135 world_entities/weapons/rocket.h \ 136 world_entities/weapons/guided_missile.h \ 137 world_entities/weapons/laser.h \ 138 world_entities/weapons/aim.h \ 139 world_entities/weapons/bomb.h \ 140 world_entities/weapons/crosshair.h \ 141 world_entities/power_ups/power_up.h \ 142 world_entities/power_ups/turret_power_up.h \ 143 world_entities/power_ups/laser_power_up.h \ 144 world_entities/power_ups/param_power_up.h \ 145 world_entities/power_ups/weapon_power_up.h \ 146 world_entities/space_ships/space_ship.h \ 147 world_entities/space_ships/helicopter.h \ 148 world_entities/creatures/md2_creature.h \ 149 world_entities/spawning_point.h \ 150 defs/stdincl.h \ 151 defs/stdlibincl.h \ 152 defs/sdlincl.h \ 153 defs/glincl.h \ 154 defs/alincl.h \ 155 defs/comincl.h \ 156 defs/confincl.h \ 157 defs/error.h \ 158 defs/debug.h \ 159 defs/globals.h \ 160 defs/compiler.h \ 161 defs/class_id.h \ 162 subprojects/benchmark.h 57 noinst_HEADERS = \ 58 $(WorldEntities_HEADERS_) \ 59 $(StoryEntities_HEADERS_) \ 60 orxonox.h \ 61 ability.h \ 62 defs/message_structures.h \ 63 defs/stdincl.h \ 64 defs/stdlibincl.h \ 65 defs/sdlincl.h \ 66 defs/glincl.h \ 67 defs/alincl.h \ 68 defs/comincl.h \ 69 defs/confincl.h \ 70 defs/error.h \ 71 defs/debug.h \ 72 defs/globals.h \ 73 defs/compiler.h \ 74 defs/class_id.h \ 75 subprojects/benchmark.h 163 76 164 77 … … 170 83 proto/proto_world_entity.h \ 171 84 proto/proto_world_entity.cc \ 172 defs/include_paths.am 85 defs/include_paths.am \ 86 world_entities/Makefile.am \ 87 story_entities/Makefile.am 173 88 174 89 if SUB_PROJECTS -
trunk/src/story_entities/Makefile.am
r6429 r6432 1 MAINSRCDIR=..2 include $(MAINSRCDIR)/defs/include_paths.am1 #MAINSRCDIR=.. 2 #include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 noinst_LIBRARIES = libORXworld_entities.a 4 StoryEntities_SOURCES_ = \ 5 story_entities/story_entity.cc \ 6 story_entities/campaign.cc \ 7 story_entities/campaign_data.cc \ 8 story_entities/game_world.cc \ 9 story_entities/game_world_data.cc \ 10 story_entities/single_player_world.cc \ 11 story_entities/single_player_world_data.cc \ 12 story_entities/multi_player_world.cc \ 13 story_entities/multi_player_world_data.cc 5 14 6 libORXworld_entities_a_SOURCES = \ 7 world_entity.cc \ 8 camera.cc \ 9 playable.cc \ 10 player.cc \ 11 npc.cc \ 12 npc2.cc \ 13 environment.cc \ 14 skysphere.cc \ 15 skybox.cc \ 16 terrain.cc \ 17 satellite.cc \ 18 character_attributes.cc \ 19 test_entity.cc \ 20 space_ships/space_ship.cc \ 21 creatures/md2_creature.cc \ 22 weapons/weapon_manager.cc \ 23 weapons/weapon.cc \ 24 weapons/test_gun.cc \ 25 weapons/turret.cc \ 26 weapons/projectile.cc \ 27 weapons/test_bullet.cc \ 28 weapons/rocket.cc \ 29 weapons/laser.cc \ 30 weapons/ground_turret.cc \ 31 weapons/crosshair.cc \ 32 weapons/ground_turret.cc \ 33 power_ups/power_up.cc \ 34 power_ups/turret_power_up.cc \ 35 power_ups/laser_power_up.cc 36 37 noinst_HEADERS = \ 38 world_entity.h \ 39 camera.h \ 40 playable.h \ 41 player.h \ 42 npc.h \ 43 npc2.h \ 44 environment.h \ 45 skysphere.h \ 46 skybox.h \ 47 terrain.h \ 48 satellite.h \ 49 character_attributes.h \ 50 test_entity.h \ 51 space_ships/space_ship.h \ 52 creatures/md2_creature.cc \ 53 weapons/weapon_manager.h \ 54 weapons/weapon.h \ 55 weapons/projectile.h \ 56 weapons/test_gun.h \ 57 weapons/turret.h \ 58 weapons/test_bullet.h \ 59 weapons/crosshair.h \ 60 power_ups/power_up.h \ 61 power_ups/turret_power_up.h \ 62 power_ups/laser_power_up.h 63 64 65 SUBDIRS = . . 15 StoryEntities_HEADERS_ = \ 16 story_entities/story_entity.h \ 17 story_entities/story_def.h \ 18 story_entities/campaign.h \ 19 story_entities/campaign_data.h \ 20 story_entities/game_world.h \ 21 story_entities/game_world_data.h \ 22 story_entities/single_player_world.h \ 23 story_entities/single_player_world_data.h \ 24 story_entities/multi_player_world.h \ 25 story_entities/multi_player_world_data.h -
trunk/src/world_entities/Makefile.am
r6222 r6432 1 MAINSRCDIR=..2 include $(MAINSRCDIR)/defs/include_paths.am1 #MAINSRCDIR=.. 2 #include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 noinst_LIBRARIES = libORXworld_entities.a 4 #noinst_LIBRARIES = libORXworld_entities.a 5 #libORXworld_entities_a_SOURCES = 6 #subdirs = . 5 7 6 libORXworld_entities_a_SOURCES = \ 7 world_entity.cc \ 8 camera.cc \ 9 playable.cc \ 10 player.cc \ 11 npc.cc \ 12 npc2.cc \ 13 environment.cc \ 14 skysphere.cc \ 15 skybox.cc \ 16 terrain.cc \ 17 satellite.cc \ 18 character_attributes.cc \ 19 test_entity.cc \ 20 space_ships/space_ship.cc \ 21 creatures/md2_creature.cc \ 22 weapons/weapon_manager.cc \ 23 weapons/weapon.cc \ 24 weapons/test_gun.cc \ 25 weapons/turret.cc \ 26 weapons/projectile.cc \ 27 weapons/test_bullet.cc \ 28 weapons/rocket.cc \ 29 weapons/laser.cc \ 30 weapons/ground_turret.cc \ 31 weapons/crosshair.cc \ 32 weapons/ground_turret.cc \ 33 power_ups/power_up.cc \ 34 power_ups/turret_power_up.cc \ 35 power_ups/laser_power_up.cc 8 WorldEntities_SOURCES_ = \ 9 world_entities/world_entity.cc \ 10 world_entities/camera.cc \ 11 world_entities/playable.cc \ 12 world_entities/player.cc \ 13 world_entities/npcs/npc.cc \ 14 world_entities/npcs/npc_test1.cc \ 15 world_entities/npcs/npc_test.cc \ 16 world_entities/npcs/ground_turret.cc \ 17 world_entities/environment.cc \ 18 world_entities/skysphere.cc \ 19 world_entities/skybox.cc \ 20 world_entities/terrain.cc \ 21 world_entities/satellite.cc \ 22 world_entities/character_attributes.cc \ 23 world_entities/test_entity.cc \ 24 world_entities/weapons/weapon_manager.cc \ 25 world_entities/weapons/weapon.cc \ 26 world_entities/weapons/projectile.cc \ 27 world_entities/weapons/test_gun.cc \ 28 world_entities/weapons/turret.cc \ 29 world_entities/weapons/aiming_turret.cc \ 30 world_entities/weapons/targeting_turret.cc \ 31 world_entities/weapons/cannon.cc \ 32 world_entities/weapons/test_bullet.cc \ 33 world_entities/weapons/rocket.cc \ 34 world_entities/weapons/guided_missile.cc \ 35 world_entities/weapons/laser.cc \ 36 world_entities/weapons/aim.cc \ 37 world_entities/weapons/bomb.cc \ 38 world_entities/weapons/crosshair.cc \ 39 world_entities/power_ups/power_up.cc \ 40 world_entities/power_ups/turret_power_up.cc \ 41 world_entities/power_ups/laser_power_up.cc \ 42 world_entities/power_ups/weapon_power_up.cc \ 43 world_entities/power_ups/param_power_up.cc \ 44 world_entities/space_ships/space_ship.cc \ 45 world_entities/space_ships/helicopter.cc \ 46 world_entities/creatures/md2_creature.cc \ 47 world_entities/spawning_point.cc 36 48 37 noinst_HEADERS = \ 38 world_entity.h \ 39 camera.h \ 40 playable.h \ 41 player.h \ 42 npc.h \ 43 npc2.h \ 44 environment.h \ 45 skysphere.h \ 46 skybox.h \ 47 terrain.h \ 48 satellite.h \ 49 character_attributes.h \ 50 test_entity.h \ 51 space_ships/space_ship.h \ 52 creatures/md2_creature.cc \ 53 weapons/weapon_manager.h \ 54 weapons/weapon.h \ 55 weapons/projectile.h \ 56 weapons/test_gun.h \ 57 weapons/turret.h \ 58 weapons/test_bullet.h \ 59 weapons/crosshair.h \ 60 power_ups/power_up.h \ 61 power_ups/turret_power_up.h \ 62 power_ups/laser_power_up.h 63 64 65 SUBDIRS = . . 49 WorldEntities_HEADERS_ = \ 50 world_entities/world_entity.h \ 51 world_entities/camera.h \ 52 world_entities/extendable.h \ 53 world_entities/playable.h \ 54 world_entities/player.h \ 55 world_entities/npcs/npc.h \ 56 world_entities/npcs/npc_test.h \ 57 world_entities/npcs/npc_test1.h \ 58 world_entities/environment.h \ 59 world_entities/skysphere.h \ 60 world_entities/skybox.h \ 61 world_entities/terrain.h \ 62 world_entities/satellite.h \ 63 world_entities/character_attributes.h \ 64 world_entities/test_entity.h \ 65 world_entities/weapons/weapon_manager.h \ 66 world_entities/weapons/weapon.h \ 67 world_entities/weapons/projectile.h \ 68 world_entities/weapons/test_gun.h \ 69 world_entities/weapons/cannon.h \ 70 world_entities/weapons/turret.h \ 71 world_entities/weapons/aiming_turret.h \ 72 world_entities/weapons/targeting_turret.h \ 73 world_entities/weapons/test_bullet.h \ 74 world_entities/weapons/rocket.h \ 75 world_entities/weapons/guided_missile.h \ 76 world_entities/weapons/laser.h \ 77 world_entities/weapons/aim.h \ 78 world_entities/weapons/bomb.h \ 79 world_entities/weapons/crosshair.h \ 80 world_entities/power_ups/power_up.h \ 81 world_entities/power_ups/turret_power_up.h \ 82 world_entities/power_ups/laser_power_up.h \ 83 world_entities/power_ups/param_power_up.h \ 84 world_entities/power_ups/weapon_power_up.h \ 85 world_entities/space_ships/space_ship.h \ 86 world_entities/space_ships/helicopter.h \ 87 world_entities/creatures/md2_creature.h \ 88 world_entities/spawning_point.h -
trunk/src/world_entities/npcs/ground_turret.cc
r6429 r6432 16 16 #include "ground_turret.h" 17 17 #include "model.h" 18 #include " turret.h"18 #include "world_entities/weapons/turret.h" 19 19 20 20 #include "factory.h"
Note: See TracChangeset
for help on using the changeset viewer.
