[Orxonox-commit 6998] r11619 - code/branches/Asteroid_HS17/src/modules/asteroids2D

[vyang at orxonox.net]

Author: vyang
Date: 2017-12-03 19:48:35 +0100 (Sun, 03 Dec 2017)
New Revision: 11619

Modified:
   code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc
   code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h
   code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h
Log:
Kompilierfehler behoben

Modified: code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc
===================================================================
--- code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc	2017-12-03 18:32:18 UTC (rev 11618)
+++ code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc	2017-12-03 18:48:35 UTC (rev 11619)
@@ -150,7 +150,7 @@
     void Asteroids2D::costLife()
     {
         --lives;
-        if(live <= 0){
+        if(lives <= 0){
             endGameTimer.setTimer(8.0f, false, createExecutor(createFunctor(&Asteroids2D::end, this)));            
         }
     };

Modified: code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h
===================================================================
--- code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h	2017-12-03 18:32:18 UTC (rev 11618)
+++ code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h	2017-12-03 18:48:35 UTC (rev 11619)
@@ -98,8 +98,8 @@
             int multiplier;
 
        private:
-            Timer endGameTimer;
 
+
             Asteroids2DShip* getPlayer();
             WeakPtr<Asteroids2DShip> player;
             void toggleShowLevel(){bShowLevel = !bShowLevel;}
@@ -115,6 +115,7 @@
             Timer levelupTimer;
             Timer endGameTimer;
 
+
     };
 }
 

Modified: code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h
===================================================================
--- code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h	2017-12-03 18:32:18 UTC (rev 11618)
+++ code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h	2017-12-03 18:48:35 UTC (rev 11619)
@@ -51,6 +51,7 @@
             Vector3 randomPosition (float maxwidth, float maxheight);
             Vector3 randomVelocity(float maxspeed);
             void setAsteroids2DPlayer(Asteroids2DShip* player){this->player = player;};
+            virtual int getSize(){ return this->size;}
 
        private:
           WeakPtr<Asteroids2DShip> player;