Changeset 9868 for code/branches/invaders/src/modules/invader/InvaderEnemy.cc

Timestamp:

Dec 3, 2013, 8:18:15 PM (12 years ago)

Author:

zifloria

Message:

End game screen. Eye candy. Gameplay tweaks

File:

• code/branches/invaders/src/modules/invader/InvaderEnemy.cc (modified) (3 diffs)

code/branches/invaders/src/modules/invader/InvaderEnemy.cc

@@ -50 +50 @@
     {
         lifetime += dt;
+        // die after 5 seconds.
         if (lifetime > 5000)
-        {
             removeHealth(2000);
-        }
+
         if (player != NULL)
         {
             float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01, 2) + 1) * (player->getPosition().z - getPosition().z);
-            // if (newZ < 0)
-            //     newZ = (-100 < newZ)?-100:newZ;
-            // else
-            //     newZ = (100 > newZ)?100:newZ;
             setVelocity(Vector3(1000 - level * 100 , 0, newZ));
         }
@@ -68 +64 @@
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        // setVelocity(Vector3(1500,0,0));
-        removeHealth(2000);
+        if(orxonox_cast<Pawn*>(otherObject))
+            removeHealth(2000);
         return false;
     }
@@ -87 +83 @@
         if (getGame())
             getGame()->addPoints(42);
-        // SUPER(InvaderEnemy, damage, damage, healthdamage, shielddamage, originator);
+        Pawn::damage(damage, healthdamage, shielddamage, originator);
     }
 }