Changeset 9868 for code/branches/invaders/src/modules/invader/Invader.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/Invader.cc (modified) (6 diffs)

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

@@ -59 +59 @@
         RegisterObject(Invader);
         this->center_ = 0;
+        init();
+        this->setHUDTemplate("InvaderHUD");
+    }
 
-        this->console_addEnemy = createConsoleCommand( "spawnEnemy", createExecutor( createFunctor(&Invader::spawnEnemy, this) ) );
-        //this->context = context;
-        this->setHUDTemplate("InvaderHUD");
-
+    void Invader::init()
+    {
+        bEndGame = false;
         lives = 3;
+        // TODO:
         level = 1;
         point = 0;
         multiplier = 1;
         b_combo = false;
+        // spawn enemy every 2 seconds
         enemySpawnTimer.setTimer(2.0f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
         comboTimer.setTimer(2.5f, true, createExecutor(createFunctor(&Invader::comboControll, this)));
-    }
-
-    Invader::~Invader()
-    {
     }
 
@@ -94 +94 @@
             newPawn->setPlayer(player);
             newPawn->level = level;
+            // spawn enemy at random points in front of player.
             newPawn->setPosition(player->getPosition() + Vector3(500 + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200));
         }
@@ -101 +102 @@
     {
         lives--;
-        multiplier = 0;
-        if (lives <= 0) end();
+        multiplier = 1;
+        // end the game in 30 seconds.
+        if (lives <= 0)
+            enemySpawnTimer.setTimer(30.0f, false, createExecutor(createFunctor(&Invader::end, this)));
     };
 
@@ -109 +112 @@
         if (b_combo)
             multiplier++;
+        // if no combo was performed before, reset multiplier
         else
             multiplier = 1;
@@ -114 +118 @@
     }
 
-    // inject custom player controller
- /**   void Invader::spawnPlayer(PlayerInfo* player)
-    {
-        assert(player);
-
-        //player->startControl(new InvaderShip(this->center_->getContext() ) );
-    }*/
-
     void Invader::start()
     {
+        init();
         // Set variable to temporarily force the player to spawn.
         this->bForceSpawn_ = true;
@@ -137 +134 @@
     }
 
+
     void Invader::end()
     {
-        orxout() << "STOP THE GAME, CHEATER!!!" << endl;
-        // Call end for the parent class.
-        // Deathmatch::end();
+        // DON'T CALL THIS!
+        //      Deathmatch::end();
+        // It will misteriously crash the game!
+        // Instead startMainMenu, this won't crash.
+        GSLevel::startMainMenu();
     }
 }