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

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

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      simonmie
  *
  */
@@ -46 +46 @@
 
         this->setConfigValues();
-//        this->bDestroy_ = false;
-//        this->owner_ = 0;
-//        this->damage_ = 115;
-///////////////////me
-//        this->healthdamage_ = 0;
-//        this->shielddamage_ = 0;
-///////////////////end me
+        this->owner_ = 0;
 
         // Get notification about collisions
-
         if (GameMode::isMaster())
         {
@@ -98 +91 @@
     }
 
+    /* Calls the collidesAgainst function of BasicProjectile
+     */
     bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
@@ -103 +98 @@
     }
 
-//////////////////////////me edit
-/*    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
-    {
-        if (!this->bDestroy_ && GameMode::isMaster())
-        {
-            if (otherObject == this->owner_)
-                return false;
-
-            this->bDestroy_ = true;
-
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject); //if otherObject isn't a Pawn, then victim is NULL
-
-            if (this->owner_)
-            {
-                if (!victim || (victim && !victim->hasShield())) //same like below
-                {
-                    ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
-                    effect->setPosition(this->getPosition());
-                    effect->setOrientation(this->getOrientation());
-                    effect->setDestroyAfterLife(true);
-                    effect->setSource("Orxonox/explosion3");
-                    effect->setLifetime(2.0f);
-                }
-                if (!victim || (victim && !victim->hasShield())) //same like above
-                {
-                    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);
-                }
-                if (victim && victim->hasShield())
-                {
-                    ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
-                    effect->setPosition(this->getPosition());
-                    effect->setOrientation(this->getOrientation());
-                    effect->setDestroyAfterLife(true);
-                    effect->setSource("Orxonox/engineglow");
-                    effect->setLifetime(0.5f);
-                }
-            }
-
-            if (victim)
-            {
-                victim->hit(this->owner_, contactPoint, this->damage_, this->healthdamage_, this->shielddamage_);
-                victim->startReloadCountdown();
-            }
-        }
-        return false;
-    }
-//////////////////////////////////////////////////////////////////////end edit
-*/
     void Projectile::setOwner(Pawn* owner)
     {