Changeset 8538 for code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.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/Rocket.cc (modified) (3 diffs)

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

@@ -148 +148 @@
     {
         this->owner_ = owner;
-        this->player_ = this->owner_->getPlayer();
-        this->owner_->getPlayer()->startTemporaryControl(this);
+        this->player_ = this->getOwner()->getPlayer();
+        this->getOwner()->getPlayer()->startTemporaryControl(this);
 
         if( GameMode::isMaster() )
@@ -185 +185 @@
     bool Rocket::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())
@@ -246 +246 @@
     {
         ParticleSpawner *effect1, *effect2;
-        if( this->owner_ )
-        {
-            effect1 = new ParticleSpawner(this->owner_->getCreator());
-            effect2 = new ParticleSpawner(this->owner_->getCreator());
+        if( this->getOwner() )
+        {
+            effect1 = new ParticleSpawner(this->getOwner()->getCreator());
+            effect2 = new ParticleSpawner(this->getOwner()->getCreator());
         }
         else