Changeset 8542 for code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc

Timestamp:

May 23, 2011, 3:54:40 PM (13 years ago)

Author:

simonmie

Message:

comments added, unused parts removed, some spam messages removed

File:

• code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.cc (modified) (5 diffs)

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

@@ -23 +23 @@
  *      Oliver Scheuss
  *   Co-authors:
- *      ...
+ *      simonmie
  *
  */
@@ -43 +43 @@
 #include "Scene.h"
 
-#include "BasicProjectile.h"
-
 namespace orxonox
 {
@@ -59 +57 @@
 
         this->localAngularVelocity_ = 0;
-//        this->bDestroy_ = false;
         this->lifetime_ = 100;
 
@@ -183 +180 @@
     }
 
+    /* Calls the collidesAgainst function of BasicProjectile
+     */
     bool Rocket::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);
-                }
-            }
-
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
-            if (victim)
-                victim->hit(this->owner_, contactPoint, this->damage_);
-//             this->destroy();
-        }
-/ * */        return false;
     }
 
@@ -237 +201 @@
     void Rocket::fired(unsigned int firemode)
     {
-//         if (this->owner_)
-//         {
-            this->destroy();
-//         }
+        this->destroy();
     }