Changeset 8579 for code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc

Timestamp:

May 25, 2011, 9:28:29 PM (13 years ago)

Author:

dafrick

Message:

Reverse merge to revert last, failed, merge. Apparently you can't partially commit a merge.

File:

• code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.cc (modified) (4 diffs)

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

@@ -23 +23 @@
  *      Oliver Scheuss
  *   Co-authors:
- *      simonmie
+ *      ...
  *
  */
@@ -48 +48 @@
     CreateFactory(SimpleRocket);
 
-    SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator), BasicProjectile()
+    SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator)
     {
         RegisterObject(SimpleRocket);// - register the SimpleRocket class to the core
 
         this->localAngularVelocity_ = 0;
+        this->bDestroy_ = false;
         this->lifetime_ = 120;
 
         this->setMass(15);
-//        COUT(4) << "simplerocket constructed\n";
+        COUT(4) << "simplerocket constructed\n";
 
         if (GameMode::isMaster())
@@ -114 +115 @@
                 this->disableFire();
 
-            if( this->getBDestroy() )
+            if( this->bDestroy_ )
                 this->destroy();
         }
@@ -158 +159 @@
     {
         this->owner_ = owner;
-        this->player_ = this->getOwner()->getPlayer();
-    }
-
-
-    /* Calls the collidesAgainst function of BasicProjectile
-     */
+        this->player_ = this->owner_->getPlayer();
+    }
+
+
+
+
     bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->getOwner(),this);
+        if (!this->bDestroy_ && GameMode::isMaster())
+        {
+            if (otherObject == this->owner_)
+                return false;
+
+            this->bDestroy_ = true;
+
+            if (this->owner_)
+            {
+                {
+                    ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                    effect->setPosition(this->getPosition());
+                    effect->setOrientation(this->getOrientation());
+                    effect->setDestroyAfterLife(true);
+                    effect->setSource("Orxonox/explosion4");
+                    effect->setLifetime(2.0f);
+                }
+
+                {
+                    ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                    effect->setPosition(this->getPosition());
+                    effect->setOrientation(this->getOrientation());
+                    effect->setDestroyAfterLife(true);
+                    effect->setSource("Orxonox/smoke4");
+                    effect->setLifetime(3.0f);
+                }
+            }
+
+            float dmg = this->damage_;
+//             if (this->owner_)
+//                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+
+            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
+            if (victim)
+                victim->hit(this->owner_, contactPoint, dmg);
+        }
+        return false;
     }