Changeset 10170 in orxonox.OLD for branches/playability/src
- Timestamp:
- Jan 3, 2007, 4:44:17 PM (18 years ago)
- Location:
- branches/playability/src/world_entities
- Files:
-
- 6 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/WorldEntities.am
r10168 r10170 41 41 world_entities/weapons/heavy_blaster.cc \ 42 42 world_entities/weapons/swarm_launcher.cc \ 43 world_entities/weapons/spike_launcher.cc \ 43 44 \ 44 45 world_entities/projectiles/lbolt.cc \ … … 54 55 world_entities/projectiles/boomerang_projectile.cc \ 55 56 world_entities/projectiles/hyperblast.cc \ 56 world_entities/projectiles/acid_splash.cc \ 57 world_entities/projectiles/spike.cc \ 58 world_entities/projectiles/spike_ball.cc \ 57 59 \ 58 60 world_entities/power_ups/turret_power_up.cc \ … … 155 157 weapons/heavy_blaster.h \ 156 158 weapons/swarm_launcher.h \ 159 weapons/spike_launcher.h \ 157 160 \ 158 161 projectiles/lbolt.h \ … … 168 171 projectiles/boomerang_projectile.h \ 169 172 projectiles/hyperblast.h \ 170 projectiles/acid_splash.h \ 173 projectiles/spike.h \ 174 projectiles/spike_ball.h \ 171 175 \ 172 176 power_ups/turret_power_up.h \ -
branches/playability/src/world_entities/projectiles/mbolt.cc
r10168 r10170 55 55 this->lifeSpan = 3.0; 56 56 this->angle = 0; 57 58 57 59 58 //this->emitter = new DotEmitter(1000, 0, 0); -
branches/playability/src/world_entities/space_ships/space_ship.cc
r10159 r10170 27 27 #include "weapons/heavy_blaster.h" 28 28 #include "weapons/swarm_launcher.h" 29 #include "weapons/spike_launcher.h" 29 30 #include "weapons/boomerang_gun.h" 30 31 #include "weapons/turret.h" … … 170 171 //wpLeft3->setParent( this); 171 172 172 Weapon* cannon = new S warmLauncher();173 cannon->setName( "S warmLauncher");173 Weapon* cannon = new SpikeLauncher(); 174 cannon->setName( "SpikeLauncher"); 174 175 //cannon->setParent( this); 175 176 -
branches/playability/src/world_entities/weapons/heavy_blaster.cc
r10159 r10170 35 35 HeavyBlaster::~HeavyBlaster() 36 36 { 37 for (int i = 0; i < this->getBarrels(); i++) 38 { 39 for(int j = 0; j < this->getSegs(); j++) 40 { 41 delete this->shootAnim[i][j]; 42 delete this->objComp[i][j]; 43 } 44 delete this->shootAnim[i]; 45 delete this->objComp[i]; 46 delete this->emissionPoint[i]; 47 } 48 37 49 this->deconstr(); 38 50 // model will be deleted from WorldEntity-destructor … … 69 81 70 82 this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT); 71 this->setProjectileTypeC("HBolt"); // FIXME temp project type until the blaste class exist 83 this->setProjectileTypeC("HBolt"); // FIXME temp project type until the blaste class exist 84 // this->setProjectileTypeC("SpikeBall"); // FIXME temp project type until the blaste class exist 72 85 this->prepareProjectiles(5); 73 86 -
branches/playability/src/world_entities/weapons/light_blaster.cc
r10159 r10170 34 34 LightBlaster::~LightBlaster() 35 35 { 36 for (int i = 0; i < this->getBarrels(); i++) 37 { 38 for(int j = 0; j < this->getSegs(); j++) 39 { 40 delete this->shootAnim[i][j]; 41 delete this->objComp[i][j]; 42 } 43 delete this->shootAnim[i]; 44 delete this->objComp[i]; 45 delete this->emissionPoint[i]; 46 } 47 48 this->deconstr(); 36 49 // model will be deleted from WorldEntity-destructor 37 50 } … … 64 77 //this->setProjectileTypeC("RailProjectile"); // FIXME temp project type until the blaste class exist 65 78 this->setProjectileTypeC("LBolt"); // Working; FIXME: add textures 79 // this->setProjectileTypeC("Spike"); // Working; FIXME: add textures 66 80 this->prepareProjectiles(100); 67 81 … … 103 117 104 118 for (int i = 0; i < this->getBarrels(); i++){ 105 this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion( 0.0, 0.0, 0.0), 0.04, ANIM_NULL, ANIM_LINEAR);106 this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion( M_2_PI/3.0, 0.0, 0.0), 0.01, ANIM_NULL, ANIM_LINEAR);119 this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(i * 120, Vector(1.0, 0.0, 0.0)), 0.049, ANIM_NULL, ANIM_LINEAR); 120 this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion((i+1)*120, Vector(1.0, 0.0, 0.0)), 0.001, ANIM_NULL, ANIM_LINEAR); 107 121 } 108 122
Note: See TracChangeset
for help on using the changeset viewer.