Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10539 in orxonox.OLD for trunk/src/world_entities/projectiles


Ignore:
Timestamp:
Jan 31, 2007, 4:27:32 AM (18 years ago)
Author:
marcscha
Message:

Fixes for weapon systems

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/projectiles/swarm_projectile.cc

    r10538 r10539  
    226226  if( this->target != NULL && (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
    227227  {
    228     dynamic_cast<WorldEntity*>(target)->hit(this->getDamage(), this);
    229     this->deactivate();
    230   }
     228    dynamic_cast<WorldEntity*>(target)->destroy(this); //hit(this->getDamage(), this);
     229    this->deactivate();
     230    PRINTF(0)("Target was hit by Swarm Missile!\n");
     231  }
     232  else if( this->target == NULL)
     233    this->deactivate();
    231234}
    232235
Note: See TracChangeset for help on using the changeset viewer.