Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10170 in orxonox.OLD for branches/playability/src


Ignore:
Timestamp:
Jan 3, 2007, 4:44:17 PM (18 years ago)
Author:
nicolasc
Message:

EOD commit

Location:
branches/playability/src/world_entities
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/playability/src/world_entities/WorldEntities.am

    r10168 r10170  
    4141                world_entities/weapons/heavy_blaster.cc \
    4242                world_entities/weapons/swarm_launcher.cc \
     43                world_entities/weapons/spike_launcher.cc \
    4344                \
    4445                world_entities/projectiles/lbolt.cc \
     
    5455                world_entities/projectiles/boomerang_projectile.cc \
    5556                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 \
    5759                \
    5860                world_entities/power_ups/turret_power_up.cc \
     
    155157                weapons/heavy_blaster.h \
    156158                weapons/swarm_launcher.h \
     159                weapons/spike_launcher.h \
    157160                \
    158161                projectiles/lbolt.h \
     
    168171                projectiles/boomerang_projectile.h \
    169172                projectiles/hyperblast.h \
    170                 projectiles/acid_splash.h \
     173                projectiles/spike.h \
     174                projectiles/spike_ball.h \
    171175                \
    172176                power_ups/turret_power_up.h \
  • branches/playability/src/world_entities/projectiles/mbolt.cc

    r10168 r10170  
    5555  this->lifeSpan = 3.0;
    5656  this->angle     = 0;
    57 
    5857
    5958  //this->emitter = new DotEmitter(1000, 0, 0);
  • branches/playability/src/world_entities/space_ships/space_ship.cc

    r10159 r10170  
    2727#include "weapons/heavy_blaster.h"
    2828#include "weapons/swarm_launcher.h"
     29#include "weapons/spike_launcher.h"
    2930#include "weapons/boomerang_gun.h"
    3031#include "weapons/turret.h"
     
    170171  //wpLeft3->setParent( this);
    171172
    172   Weapon* cannon = new SwarmLauncher();
    173   cannon->setName( "SwarmLauncher");
     173  Weapon* cannon = new SpikeLauncher();
     174  cannon->setName( "SpikeLauncher");
    174175  //cannon->setParent( this);
    175176
  • branches/playability/src/world_entities/weapons/heavy_blaster.cc

    r10159 r10170  
    3535HeavyBlaster::~HeavyBlaster()
    3636{
     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
    3749  this->deconstr();
    3850     // model will be deleted from WorldEntity-destructor
     
    6981
    7082  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
    7285  this->prepareProjectiles(5);
    7386
  • branches/playability/src/world_entities/weapons/light_blaster.cc

    r10159 r10170  
    3434LightBlaster::~LightBlaster()
    3535{
     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();
    3649      // model will be deleted from WorldEntity-destructor
    3750}
     
    6477  //this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
    6578  this->setProjectileTypeC("LBolt");   // Working; FIXME: add textures
     79//   this->setProjectileTypeC("Spike");   // Working; FIXME: add textures
    6680  this->prepareProjectiles(100);
    6781
     
    103117
    104118  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);
    107121  }
    108122
Note: See TracChangeset for help on using the changeset viewer.