- Timestamp:
- May 23, 2011, 2:26:25 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc
r7163 r8533 48 48 CreateFactory(SimpleRocket); 49 49 50 SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator) 50 SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator), BasicProjectile() 51 51 { 52 52 RegisterObject(SimpleRocket);// - register the SimpleRocket class to the core 53 53 54 54 this->localAngularVelocity_ = 0; 55 this->bDestroy_ = false;55 // this->bDestroy_ = false; 56 56 this->lifetime_ = 120; 57 57 … … 115 115 this->disableFire(); 116 116 117 if( this-> bDestroy_)117 if( this->getBDestroy() ) 118 118 this->destroy(); 119 119 } … … 167 167 bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint) 168 168 { 169 if (!this->bDestroy_ && GameMode::isMaster()) 169 return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this); 170 /* if (!this->bDestroy_ && GameMode::isMaster()) 170 171 { 171 172 if (otherObject == this->owner_) … … 204 205 } 205 206 return false; 207 */ 206 208 } 207 209
Note: See TracChangeset
for help on using the changeset viewer.