Changeset 10154 for code/branches/surfaceraceHS14

Timestamp:

Dec 3, 2014, 5:30:46 PM (9 years ago)

Author:

sriedel

Message:

Death now in endGameTimer

Location:

code/branches/surfaceraceHS14

Files:

• data/levels/templates/spaceshipDodgeRace.oxt (modified) (1 diff)
• src/modules/dodgerace2/DodgeRace.cc (modified) (1 diff)
• src/modules/dodgerace2/DodgeRace.h (modified) (1 diff)
• src/modules/dodgerace2/DodgeRaceShip.cc (modified) (1 diff)

code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt

@@ -11 +11 @@
    initialhealth     = 40
 
-   shieldhealth        = 80
-   initialshieldhealth = 80
-   maxshieldhealth     = 80
-   shieldabsorption    = 0.9
+   shieldhealth        = 20
+   initialshieldhealth = 20
+   maxshieldhealth     = 20
+   shieldabsorption    = 0.1
    reloadrate          = 1
    reloadwaittime      = 1

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc

@@ -175 +175 @@
     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)));
     };
 

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h

@@ -102 +102 @@
 
        private:
+            Timer endGameTimer;
+
             WeakPtr<DodgeRaceShip> getPlayer();
             WeakPtr<DodgeRaceShip> player;

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc

@@ -163 +163 @@
                 */
 
-
+        removeHealth(100);
         this->death();
         return false;