- Timestamp:
- May 16, 2011, 5:25:00 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc
r8386 r8492 36 36 #include "worldentities/pawns/Pawn.h" 37 37 #include "graphics/ParticleSpawner.h" 38 #include "BasicProjectile.h" 38 39 39 40 namespace orxonox … … 41 42 CreateFactory(Projectile); 42 43 43 Projectile::Projectile(BaseObject* creator) : MovableEntity(creator) 44 Projectile::Projectile(BaseObject* creator) : MovableEntity(creator), BasicProjectile() 44 45 { 45 46 RegisterObject(Projectile); 46 47 47 48 this->setConfigValues(); 48 this->bDestroy_ = false;49 // this->bDestroy_ = false; 49 50 this->owner_ = 0; 50 this->damage_ = 115;51 // this->damage_ = 115; 51 52 ///////////////////me 52 this->healthdamage_ = 0;53 this->shielddamage_ = 0;53 // this->healthdamage_ = 0; 54 // this->shielddamage_ = 0; 54 55 ///////////////////end me 55 56 … … 88 89 return; 89 90 90 if (this-> bDestroy_)91 if (this->getBDestroy()) 91 92 this->destroy(); // TODO: use a scheduler instead of deleting the object right here in tick() 92 93 } … … 98 99 } 99 100 101 bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint) 102 { 103 return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this); 104 } 105 100 106 //////////////////////////me edit 101 bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)107 /* bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint) 102 108 { 103 109 if (!this->bDestroy_ && GameMode::isMaster()) … … 150 156 } 151 157 //////////////////////////////////////////////////////////////////////end edit 152 158 */ 153 159 void Projectile::setOwner(Pawn* owner) 154 160 { 155 161 this->owner_ = owner; 156 162 } 163 157 164 }
Note: See TracChangeset
for help on using the changeset viewer.