Changeset 8183 for code/branches/gameimmersion/src/modules

Timestamp:

Apr 4, 2011, 2:14:25 PM (13 years ago)

Author:

simonmie

Message:

Added countdown time before shield reload starts

File:

• code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc (modified) (4 diffs)

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

@@ -94 +94 @@
     }
 
+//////////////////////////me edit
     bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
@@ -103 +104 @@
             this->bDestroy_ = true;
 
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
+            Pawn* victim = orxonox_cast<Pawn*>(otherObject); //if otherObject isn't a Pawn, then victim is NULL
 
             if (this->owner_)
             {
-                if (victim && !victim->hasShield())
+                if (!victim || (victim && !victim->hasShield())) //same like below
                 {
                     ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
@@ -116 +117 @@
                     effect->setLifetime(2.0f);
                 }
-                if (victim && !victim->hasShield())
+                if (!victim || (victim && !victim->hasShield())) //same like above
                 {
                     ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
@@ -137 +138 @@
 
             if (victim)
+            {
                 victim->hit(this->owner_, contactPoint, this->damage_);
+                victim->startReloadCountdown();
+            }
         }
         return false;
     }
+//////////////////////////////////////////////////////////////////////end edit
 
     void Projectile::setOwner(Pawn* owner)