Changeset 8538 for code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc

Timestamp:

May 23, 2011, 3:09:07 PM (13 years ago)

Author:

simonmie

Message:

some comments in test-Weaponsettings made

File:

• code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc (modified) (2 diffs)

code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -159 +159 @@
     {
         this->owner_ = owner;
-        this->player_ = this->owner_->getPlayer();
+        this->player_ = this->getOwner()->getPlayer();
     }
 
@@ -167 +167 @@
     bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->getOwner(),this);
 /*        if (!this->bDestroy_ && GameMode::isMaster())
         {