Changeset 9858 for code/branches/invaders/src/modules

Timestamp:

Dec 2, 2013, 4:08:30 PM (11 years ago)

Author:

zifloria

Message:

hbskdjbs

Location:

code/branches/invaders/src/modules/invader

Files:

• Invader.cc (modified) (1 diff)
• Invader.h (modified) (1 diff)
• InvaderEnemy.cc (modified) (1 diff)

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

@@ -98 +98 @@
     }
 
+    void Invader::costLife()
+    {
+        lives--;
+        multiplier = 0;
+        if (lives <= 0) end();
+    };
+
     void Invader::comboControll()
     {

code/branches/invaders/src/modules/invader/Invader.h

@@ -68 +68 @@
             int getMultiplier(){return this->multiplier;}
 
-            void costLife(){lives--; if (lives <= 0) end();};
+            void costLife();
             void levelUp(){level++;}
             void addPoints(int numPoints){point += numPoints * multiplier; b_combo = true;}

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

@@ -68 +68 @@
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        setVelocity(Vector3(1000,0,0));
+        // setVelocity(Vector3(1000,0,0));
         removeHealth(2000);
         return false;