[Orxonox-commit 5915] r10574 - in code/branches/core7/src/modules: dodgerace invader objects

[landauf at orxonox.net]

Author: landauf
Date: 2015-09-09 13:49:55 +0200 (Wed, 09 Sep 2015)
New Revision: 10574

Modified:
   code/branches/core7/src/modules/dodgerace/DodgeRace.cc
   code/branches/core7/src/modules/dodgerace/DodgeRace.h
   code/branches/core7/src/modules/invader/Invader.cc
   code/branches/core7/src/modules/invader/Invader.h
   code/branches/core7/src/modules/objects/Planet.cc
   code/branches/core7/src/modules/objects/Planet.h
Log:
removed some init() functions, integrated them directly into the constructor (and it's not necessary to call init() again when a gametype starts)

Modified: code/branches/core7/src/modules/dodgerace/DodgeRace.cc
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRace.cc	2015-09-09 11:36:00 UTC (rev 10573)
+++ code/branches/core7/src/modules/dodgerace/DodgeRace.cc	2015-09-09 11:49:55 UTC (rev 10574)
@@ -43,15 +43,7 @@
     DodgeRace::DodgeRace(Context* context) : Deathmatch(context)
     {
         RegisterObject(DodgeRace);
-        init();
-        this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
-        this->center_ = 0;
 
-        this->setHUDTemplate("DodgeRaceHUD");
-    }
-
-    void DodgeRace::init()
-    {
         bEndGame = false;
         lives = 1;
         level = 1;
@@ -65,6 +57,10 @@
         // spawn enemy every 3.5 seconds
         //enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&DodgeRace::spawnEnemy, this)));
         comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
+        this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
+        this->center_ = 0;
+
+        this->setHUDTemplate("DodgeRaceHUD");
     }
 
     void DodgeRace::levelUp()
@@ -166,7 +162,6 @@
     void DodgeRace::start()
     {
         orxout() << "start" << endl;
-        init();
         for(unsigned int i=0; i< cubeList.size();i++)
         {
             cubeList.at(i)->destroy();
@@ -197,7 +192,6 @@
         // Reset all the cubes
         /*
         orxout() << "prespawn" << endl;
-        init();
         for(int i=0; i< cubeList.size();i++)
         {
             cubeList.at(i)->destroy();

Modified: code/branches/core7/src/modules/dodgerace/DodgeRace.h
===================================================================
--- code/branches/core7/src/modules/dodgerace/DodgeRace.h	2015-09-09 11:36:00 UTC (rev 10573)
+++ code/branches/core7/src/modules/dodgerace/DodgeRace.h	2015-09-09 11:49:55 UTC (rev 10574)
@@ -68,8 +68,6 @@
        public:
             DodgeRace(Context* context);
 
-            void init();
-
             virtual void start();
             virtual void end();
 

Modified: code/branches/core7/src/modules/invader/Invader.cc
===================================================================
--- code/branches/core7/src/modules/invader/Invader.cc	2015-09-09 11:36:00 UTC (rev 10573)
+++ code/branches/core7/src/modules/invader/Invader.cc	2015-09-09 11:49:55 UTC (rev 10574)
@@ -61,12 +61,6 @@
         RegisterObject(Invader);
         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;
         level = 1;
@@ -77,6 +71,7 @@
         // spawn enemy every 3.5 seconds
         enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
         comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&Invader::comboControll, this)));
+        this->setHUDTemplate("InvaderHUD");
     }
 
     void Invader::levelUp()
@@ -154,7 +149,6 @@
 
     void Invader::start()
     {
-        init();
         // Set variable to temporarily force the player to spawn.
         this->bForceSpawn_ = true;
 

Modified: code/branches/core7/src/modules/invader/Invader.h
===================================================================
--- code/branches/core7/src/modules/invader/Invader.h	2015-09-09 11:36:00 UTC (rev 10573)
+++ code/branches/core7/src/modules/invader/Invader.h	2015-09-09 11:49:55 UTC (rev 10574)
@@ -70,7 +70,6 @@
             void addPoints(int numPoints);
             // checks if multiplier should be reset.
             void comboControll();
-            void init();
             int lives;
             int multiplier;
             bool bEndGame;

Modified: code/branches/core7/src/modules/objects/Planet.cc
===================================================================
--- code/branches/core7/src/modules/objects/Planet.cc	2015-09-09 11:36:00 UTC (rev 10573)
+++ code/branches/core7/src/modules/objects/Planet.cc	2015-09-09 11:49:55 UTC (rev 10574)
@@ -86,10 +86,6 @@
         SUPER(Planet, tick, dt);
     }
 
-    void Planet::init()
-    {
-    }
-
     void Planet::changedMesh()
     {
         if( GameMode::showsGraphics() )

Modified: code/branches/core7/src/modules/objects/Planet.h
===================================================================
--- code/branches/core7/src/modules/objects/Planet.h	2015-09-09 11:36:00 UTC (rev 10573)
+++ code/branches/core7/src/modules/objects/Planet.h	2015-09-09 11:49:55 UTC (rev 10574)
@@ -51,7 +51,6 @@
 
             virtual ~Planet();
 
-            void init();
             virtual void tick(float dt);
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);