Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 4, 2006, 6:15:10 PM (18 years ago)
Author:
rennerc
Message:
 
Location:
branches/presentation/src/world_entities/projectiles
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/presentation/src/world_entities/projectiles/guided_missile.cc

    r8362 r9162  
    135135{
    136136  if (this->hitEntity != entity)
    137     this->destroy();
     137    this->destroy( entity );
    138138  this->hitEntity = entity;
    139139}
    … …  
    180180 *  the function gets called, when the projectile is destroyed
    181181 */
    182 void GuidedMissile::destroy ()
    183 {
    184   Projectile::destroy();
     182void GuidedMissile::destroy (WorldEntity* killer)
     183{
     184  Projectile::destroy( killer );
    185185  PRINTF(5)("DESTROY GuidedMissile\n");
    186186  this->lifeCycle = .95; //!< @todo calculate this usefully.

  • branches/presentation/src/world_entities/projectiles/guided_missile.h

    r6622 r9162  
    2626    virtual void collidesWith(WorldEntity* entity, const Vector& location);
    2727
    28     virtual void destroy ();
     28    virtual void destroy (WorldEntity* killer);
    2929
    3030    virtual void tick (float time);

  • branches/presentation/src/world_entities/projectiles/hyperblast.cc

    r8362 r9162  
    126126 *  the function gets called, when the projectile is destroyed
    127127*/
    128 void Hyperblast::destroy ()
     128void Hyperblast::destroy (WorldEntity* killer)
    129129{
    130   Projectile::destroy();
     130  Projectile::destroy( killer );
    131131
    132132  PRINTF(5)("DESTROY Hyperblast\n");

  • branches/presentation/src/world_entities/projectiles/hyperblast.h

    r6821 r9162  
    2727    virtual void collidesWith(WorldEntity* entity, const Vector& location);
    2828
    29     virtual void destroy ();
     29    virtual void destroy (WorldEntity* killer);
    3030
    3131    virtual void tick (float time);

  • branches/presentation/src/world_entities/projectiles/laser.cc

    r9061 r9162  
    107107{
    108108  if (this->hitEntity != entity && entity->isA(CL_NPC))
    109     this->destroy();
     109    this->destroy( entity );
    110110  this->hitEntity = entity;
    111111}
    … …  
    128128 *  the function gets called, when the projectile is destroyed
    129129*/
    130 void Laser::destroy ()
     130void Laser::destroy (WorldEntity* killer)
    131131{
    132   Projectile::destroy();
     132  Projectile::destroy( killer );
    133133  PRINTF(5)("DESTROY Laser\n");
    134134  this->lifeCycle = .95; //!< @todo calculate this usefully.

  • branches/presentation/src/world_entities/projectiles/laser.h

    r6622 r9162  
    2727    virtual void collidesWith(WorldEntity* entity, const Vector& location);
    2828
    29     virtual void destroy ();
     29    virtual void destroy (WorldEntity* killer);
    3030
    3131    virtual void tick (float dt);

  • branches/presentation/src/world_entities/projectiles/projectile.cc

    r8362 r9162  
    162162
    163163  if (this->tickLifeCycle(dt))
    164     this->destroy();
     164    this->destroy( NULL );
    165165}
    166166
    … …  
    169169 *  the function gets called, when the projectile is destroyed
    170170*/
    171 void Projectile::destroy ()
     171void Projectile::destroy (WorldEntity* killer)
    172172{
    173173  if (this->explosionBuffer != NULL)

  • branches/presentation/src/world_entities/projectiles/projectile.h

    r7460 r9162  
    4141    virtual void deactivate() = 0;
    4242
    43     virtual void destroy ();
     43    virtual void destroy (WorldEntity* killer);
    4444
    4545    virtual void tick (float dt);

  • branches/presentation/src/world_entities/projectiles/rocket.cc

    r8362 r9162  
    128128{
    129129  if (this->hitEntity != entity)
    130     this->destroy();
     130    this->destroy( entity );
    131131  this->hitEntity = entity;
    132132}
    … …  
    149149 *  the function gets called, when the projectile is destroyed
    150150*/
    151 void Rocket::destroy ()
     151void Rocket::destroy (WorldEntity* killer)
    152152{
    153   Projectile::destroy();
     153  Projectile::destroy( killer );
    154154
    155155  PRINTF(5)("DESTROY Rocket\n");

  • branches/presentation/src/world_entities/projectiles/rocket.h

    r6622 r9162  
    2727    virtual void collidesWith(WorldEntity* entity, const Vector& location);
    2828
    29     virtual void destroy ();
     29    virtual void destroy (WorldEntity* killer);
    3030
    3131    virtual void tick (float time);

  • branches/presentation/src/world_entities/projectiles/test_bullet.cc

    r8362 r9162  
    119119{
    120120  if (this->hitEntity != entity && entity->isA(CL_NPC))
    121     this->destroy();
     121    this->destroy( entity );
    122122  this->hitEntity = entity;
    123123}
    … …  
    147147 *  the function gets called, when the projectile is destroyed
    148148*/
    149 void TestBullet::destroy ()
     149void TestBullet::destroy (WorldEntity* killer)
    150150{
    151151  PRINTF(5)("DESTROY TestBullet\n");

  • branches/presentation/src/world_entities/projectiles/test_bullet.h

    r6624 r9162  
    2727    virtual void collidesWith(WorldEntity* entity, const Vector& location);
    2828
    29     virtual void destroy ();
     29    virtual void destroy (WorldEntity* killer);
    3030
    3131    virtual void tick (float time);
Note: See TracChangeset for help on using the changeset viewer.