Changeset 10574 for code/branches/core7/src/modules/invader

Timestamp:

Sep 9, 2015, 1:49:55 PM (9 years ago)

Author:

landauf

Message:

removed some init() functions, integrated them directly into the constructor (and it's not necessary to call init() again when a gametype starts)

Location:

code/branches/core7/src/modules/invader

Files:

• Invader.cc (modified) (3 diffs)
• Invader.h (modified) (1 diff)

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

@@ -62 +62 @@
         this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
         this->center_ = 0;
-        init();
-        this->setHUDTemplate("InvaderHUD");
-    }
-
-    void Invader::init()
-    {
         bEndGame = false;
         lives = 3;
@@ -78 +72 @@
         enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
         comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&Invader::comboControll, this)));
+        this->setHUDTemplate("InvaderHUD");
     }
 
@@ -155 +150 @@
     void Invader::start()
     {
-        init();
         // Set variable to temporarily force the player to spawn.
         this->bForceSpawn_ = true;

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

@@ -71 +71 @@
             // checks if multiplier should be reset.
             void comboControll();
-            void init();
             int lives;
             int multiplier;