[Orxonox-commit 5491] r10154 - in code/branches/surfaceraceHS14: data/levels/templates src/modules/dodgerace2

[sriedel at orxonox.net]

Author: sriedel
Date: 2014-12-03 17:30:46 +0100 (Wed, 03 Dec 2014)
New Revision: 10154

Modified:
   code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt
   code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc
   code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h
   code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc
Log:
Death now in endGameTimer

Modified: code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt
===================================================================
--- code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt	2014-12-03 16:30:22 UTC (rev 10153)
+++ code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt	2014-12-03 16:30:46 UTC (rev 10154)
@@ -10,10 +10,10 @@
    maxhealth         = 40
    initialhealth     = 40
 
-   shieldhealth        = 80
-   initialshieldhealth = 80
-   maxshieldhealth     = 80
-   shieldabsorption    = 0.9
+   shieldhealth        = 20
+   initialshieldhealth = 20
+   maxshieldhealth     = 20
+   shieldabsorption    = 0.1
    reloadrate          = 1
    reloadwaittime      = 1
 

Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc	2014-12-03 16:30:22 UTC (rev 10153)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc	2014-12-03 16:30:46 UTC (rev 10154)
@@ -174,11 +174,10 @@
 */
     void DodgeRace::costLife()
     {
-        lives--;
+    	orxout() << "CostLife" << endl;
+    	endGameTimer.setTimer(3.0f, false, createExecutor(createFunctor(&DodgeRace::end, this)));
+
         multiplier = 1;
-        // end the game in 30 seconds.
-       // if (lives <= 0)
-         //   enemySpawnTimer.setTimer(30.0f, false, createExecutor(createFunctor(&DodgeRace::end, this)));
     };
 
     void DodgeRace::comboControll()

Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h	2014-12-03 16:30:22 UTC (rev 10153)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h	2014-12-03 16:30:46 UTC (rev 10154)
@@ -101,6 +101,8 @@
             int lastPosition;
 
        private:
+            Timer endGameTimer;
+
             WeakPtr<DodgeRaceShip> getPlayer();
             WeakPtr<DodgeRaceShip> player;
             std::vector<DodgeRaceCube*> cubeList;

Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc	2014-12-03 16:30:22 UTC (rev 10153)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc	2014-12-03 16:30:46 UTC (rev 10154)
@@ -162,7 +162,7 @@
         }
 		*/
 
-
+    	removeHealth(100);
     	this->death();
         return false;
     }