Changeset 11619 for code/branches

Timestamp:

Dec 3, 2017, 7:48:35 PM (7 years ago)

Author:

vyang

Message:

Kompilierfehler behoben

Location:

code/branches/Asteroid_HS17/src/modules/asteroids2D

Files:

• Asteroids2D.cc (modified) (1 diff)
• Asteroids2D.h (modified) (2 diffs)
• Asteroids2DStone.h (modified) (1 diff)

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.cc

@@ -151 +151 @@
     {
         --lives;
-        if(live <= 0){
+        if(lives <= 0){
             endGameTimer.setTimer(8.0f, false, createExecutor(createFunctor(&Asteroids2D::end, this)));            
         }

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2D.h

@@ -99 +99 @@
 
        private:
-            Timer endGameTimer;
+
 
             Asteroids2DShip* getPlayer();
@@ -116 +116 @@
             Timer endGameTimer;
 
+
     };
 }

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.h

@@ -52 +52 @@
             Vector3 randomVelocity(float maxspeed);
             void setAsteroids2DPlayer(Asteroids2DShip* player){this->player = player;};
+            virtual int getSize(){ return this->size;}
 
        private: