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

Timestamp:

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

Author:

zifloria

Message:

new Explosions!!!

Location:

code/branches/invaders/src/modules/invader

Files:

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

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

@@ -87 +87 @@
             return;
 
-        InvaderEnemy* newPawn = new InvaderEnemy(this->center_->getContext());
-        newPawn->addTemplate("enemyinvader");
-
-        newPawn->setPosition(player->getPosition() + Vector3(1000, 0, 0)); // BUG: 
+        for (int i = 0; i < level; i++)
+        {
+            SmartPtr<InvaderEnemy> newPawn = new InvaderEnemy(this->center_->getContext());
+            newPawn->addTemplate("enemyinvader");
+            newPawn->setPosition(player->getPosition() + Vector3(500 + 100 * i, 0, 0));
+        }
     }
 

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

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

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

@@ -48 +48 @@
     void InvaderEnemy::tick(float dt)
     {
+        setVelocity(Vector3(500 ,0, 0));
         SUPER(InvaderEnemy, tick, dt);
     }
@@ -53 +54 @@
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        orxout() << "sadsadasfasf" << endl;
+        setVelocity(Vector3(900,0,0));
         removeHealth(2000);
-        setVelocity(Vector3(0,0,1000));
         return false;
     }