Changeset 7264 in orxonox.OLD for branches/shared_lib/src/world_entities
- Timestamp:
- Apr 2, 2006, 4:51:19 PM (18 years ago)
- Location:
- branches/shared_lib/src/world_entities
- Files:
-
- 6 edited
-
Makefile.am (modified) (3 diffs)
-
WorldEntities.am (modified) (2 diffs)
-
space_ships/helicopter.cc (modified) (2 diffs)
-
space_ships/hover.cc (modified) (2 diffs)
-
space_ships/space_ship.cc (modified) (1 diff)
-
space_ships/turbine_hover.cc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/shared_lib/src/world_entities/Makefile.am
r7155 r7264 1 1 MAINSRCDIR=.. 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 include WorldEntities.am4 3 5 4 noinst_LIBRARIES = libORXwe.a 5 6 ## TODO :: 7 WRONG_SORTED_SOURCES_ = space_ships/space_ship.cc 8 6 9 7 10 ## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES … … 27 30 spawning_point.cc \ 28 31 \ 32 skybox.cc \ 33 terrain.cc \ 29 34 \ 30 effects/explosion.cc 35 elements/image_entity.cc \ 36 elements/text_element.cc \ 37 \ 38 effects/explosion.cc \ 39 \ 40 $(WRONG_SORTED_SOURCES_) 31 41 42 LDFLAGS = --export-dynamic -module 43 44 pkglib_LTLIBRARIES = \ 45 libORXplayables.la \ 46 libORXweapons.la \ 47 libORXprojectiles.la \ 48 libORXpower_ups.la \ 49 \ 50 libORXenvironmentals.la \ 51 \ 52 libORXnpcs.la \ 53 \ 54 libORXmisc_entities.la 55 56 57 libORXplayables_la_SOURCES = \ 58 space_ships/helicopter.cc \ 59 space_ships/hover.cc \ 60 space_ships/turbine_hover.cc \ 61 creatures/md2_creature.cc 62 63 libORXweapons_la_SOURCES = \ 64 weapons/turret.cc \ 65 weapons/aiming_turret.cc \ 66 weapons/targeting_turret.cc \ 67 weapons/cannon.cc \ 68 weapons/hyperblaster.cc \ 69 weapons/aim.cc\ 70 weapons/test_gun.cc 71 72 libORXprojectiles_la_SOURCES = \ 73 projectiles/bomb.cc \ 74 projectiles/laser.cc \ 75 projectiles/test_bullet.cc \ 76 projectiles/rocket.cc \ 77 projectiles/guided_missile.cc \ 78 projectiles/hyperblast.cc 79 80 libORXpower_ups_la_SOURCES = \ 81 power_ups/turret_power_up.cc \ 82 power_ups/laser_power_up.cc 83 84 85 libORXnpcs_la_SOURCES = \ 86 npcs/ground_turret.cc \ 87 npcs/npc_test.cc \ 88 npcs/npc_test1.cc 89 90 libORXenvironmentals_la_SOURCES = \ 91 environment.cc \ 92 skysphere.cc \ 93 satellite.cc \ 94 character_attributes.cc \ 95 test_entity.cc \ 96 planet.cc \ 97 environments/water.cc \ 98 environments/model_entity.cc \ 99 environments/building.cc \ 100 \ 101 movie_entity.cc \ 102 recorder.cc 103 104 105 libORXmisc_entities_la_SOURCES = \ 106 \ 107 effects/lightning_bolt.cc 32 108 33 109 … … 57 133 effects/explosion.h \ 58 134 \ 59 $(WorldEntities_HEADERS_) 135 \ 136 \ 137 npcs/npc_test.h \ 138 npcs/npc_test1.h \ 139 npcs/ground_turret.h \ 140 environment.h \ 141 skysphere.h \ 142 skybox.h \ 143 terrain.h \ 144 satellite.h \ 145 movie_entity.h \ 146 recorder.h \ 147 character_attributes.h \ 148 test_entity.h \ 149 planet.h \ 150 \ 151 weapons/test_gun.h \ 152 weapons/cannon.h \ 153 weapons/hyperblaster.h \ 154 weapons/turret.h \ 155 weapons/aiming_turret.h \ 156 weapons/targeting_turret.h \ 157 weapons/aim.h \ 158 \ 159 projectiles/bomb.h \ 160 projectiles/laser.h \ 161 projectiles/test_bullet.h \ 162 projectiles/rocket.h \ 163 projectiles/guided_missile.h \ 164 projectiles/hyperblast.h \ 165 \ 166 power_ups/turret_power_up.h \ 167 power_ups/laser_power_up.h \ 168 \ 169 space_ships/space_ship.h \ 170 space_ships/helicopter.h \ 171 space_ships/hover.h \ 172 space_ships/turbine_hover.h \ 173 creatures/md2_creature.h \ 174 \ 175 environments/water.h \ 176 environments/model_entity.h \ 177 environments/building.h \ 178 elements/image_entity.h \ 179 elements/text_element.h \ 180 \ 181 effects/lightning_bolt.h 60 182 61 62 EXTRA_DIST = WorldEntities.am -
branches/shared_lib/src/world_entities/WorldEntities.am
r7167 r7264 3 3 world_entities/npcs/npc_test1.cc \ 4 4 world_entities/npcs/npc_test.cc \ 5 world_entities/npcs/ground_turret.cc \6 5 \ 7 6 world_entities/environment.cc \ … … 51 50 52 51 53 WorldEntities_HEADERS_ = \54 npcs/npc_test.h \55 npcs/npc_test1.h \56 npcs/ground_turret.h \57 environment.h \58 skysphere.h \59 skybox.h \60 terrain.h \61 satellite.h \62 movie_entity.h \63 recorder.h \64 character_attributes.h \65 test_entity.h \66 planet.h \67 \68 weapons/test_gun.h \69 weapons/cannon.h \70 weapons/hyperblaster.h \71 weapons/turret.h \72 weapons/aiming_turret.h \73 weapons/targeting_turret.h \74 weapons/aim.h \75 \76 projectiles/bomb.h \77 projectiles/laser.h \78 projectiles/test_bullet.h \79 projectiles/rocket.h \80 projectiles/guided_missile.h \81 projectiles/hyperblast.h \82 \83 power_ups/turret_power_up.h \84 power_ups/laser_power_up.h \85 \86 space_ships/space_ship.h \87 space_ships/helicopter.h \88 space_ships/hover.h \89 space_ships/turbine_hover.h \90 creatures/md2_creature.h \91 \92 environments/water.h \93 environments/model_entity.h \94 environments/building.h \95 \96 elements/image_entity.h \97 elements/text_element.h \98 \99 effects/lightning_bolt.h -
branches/shared_lib/src/world_entities/space_ships/helicopter.cc
r7221 r7264 20 20 21 21 #include "weapons/weapon_manager.h" 22 #include "weapons/test_gun.h"23 #include "weapons/turret.h"24 #include "weapons/cannon.h"25 22 26 23 #include "util/loading/factory.h" … … 82 79 83 80 //weapons: 84 Weapon* wpRight = new TestGun(0);85 wpRight->setName("testGun Right");86 Weapon* wpLeft = new TestGun(1);87 wpLeft->setName("testGun Left");81 // Weapon* wpRight = new TestGun(0); 82 // wpRight->setName("testGun Right"); 83 // Weapon* wpLeft = new TestGun(1); 84 // wpLeft->setName("testGun Left"); 88 85 Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON)); 89 86 90 87 cannon->setName("BFG"); 91 88 92 this->addWeapon(wpLeft, 1, 0);93 this->addWeapon(wpRight,1 ,1);89 // this->addWeapon(wpLeft, 1, 0); 90 // this->addWeapon(wpRight,1 ,1); 94 91 this->addWeapon(cannon, 0, 6); 95 92 -
branches/shared_lib/src/world_entities/space_ships/hover.cc
r7221 r7264 20 20 21 21 #include "weapons/weapon_manager.h" 22 #include "weapons/test_gun.h"23 #include "weapons/turret.h"24 #include "weapons/cannon.h"25 22 26 23 #include "util/loading/factory.h" … … 74 71 75 72 //weapons: 76 Weapon* wpRight = new TestGun(0);77 wpRight->setName("testGun Right");78 Weapon* wpLeft = new TestGun(1);79 wpLeft->setName("testGun Left");80 Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));81 82 cannon->setName("BFG");83 84 this->addWeapon(wpLeft, 1, 0);85 this->addWeapon(wpRight,1 ,1);86 this->addWeapon(cannon, 0, 2);73 // Weapon* wpRight = new TestGun(0); 74 // wpRight->setName("testGun Right"); 75 // Weapon* wpLeft = new TestGun(1); 76 // wpLeft->setName("testGun Left"); 77 // Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER)); 78 79 // cannon->setName("BFG"); 80 81 // this->addWeapon(wpLeft, 1, 0); 82 // this->addWeapon(wpRight,1 ,1); 83 // this->addWeapon(cannon, 0, 2); 87 84 88 85 this->getWeaponManager()->changeWeaponConfig(1); -
branches/shared_lib/src/world_entities/space_ships/space_ship.cc
r7221 r7264 124 124 125 125 //weapons: 126 Weapon* wpRight = new TestGun(0);127 wpRight->setName("testGun Right");128 Weapon* wpLeft = new TestGun(1);129 wpLeft->setName("testGun Left");126 //Weapon* wpRight = dynamic_cast<Weapon*>(Factory::fabricate("TestGun")); 127 //wpRight->setName("testGun Right"); 128 //Weapon* wpLeft = dynamic_cast<Weapon*>(Factory::fabricate("TestGun")); 129 //wpLeft->setName("testGun Left"); 130 130 //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON)); 131 131 132 132 //cannon->setName("BFG"); 133 133 134 this->addWeapon(wpLeft, 1, 0);135 this->addWeapon(wpRight,1 ,1);134 //this->addWeapon(wpLeft, 1, 0); 135 //this->addWeapon(wpRight,1 ,1); 136 136 //this->addWeapon(cannon, 0, 6); 137 137 -
branches/shared_lib/src/world_entities/space_ships/turbine_hover.cc
r7221 r7264 20 20 21 21 #include "weapons/weapon_manager.h" 22 #include "weapons/test_gun.h"23 #include "weapons/turret.h"24 #include "weapons/cannon.h"25 22 26 23 #include "util/loading/factory.h" … … 76 73 77 74 //weapons: 78 Weapon* wpRight = new TestGun(0);79 wpRight->setName("testGun Right");80 Weapon* wpLeft = new TestGun(1);81 wpLeft->setName("testGun Left");75 // Weapon* wpRight = new TestGun(0); 76 // wpRight->setName("testGun Right"); 77 // Weapon* wpLeft = new TestGun(1); 78 // wpLeft->setName("testGun Left"); 82 79 //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER)); 83 80 84 81 // cannon->setName("BFG"); 85 82 86 this->addWeapon(wpLeft, 1, 0);87 this->addWeapon(wpRight,1 ,1);83 // this->addWeapon(wpLeft, 1, 0); 84 // this->addWeapon(wpRight,1 ,1); 88 85 //this->addWeapon(cannon, 0, 2); 89 86
Note: See TracChangeset
for help on using the changeset viewer.
