[Orxonox-commit 7016] r11635 - code/branches/FlappyOrx_HS17/src/modules/flappyorx

[merholzl at orxonox.net]

Author: merholzl
Date: 2017-12-04 16:13:24 +0100 (Mon, 04 Dec 2017)
New Revision: 11635

Modified:
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h
Log:
small changes

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-12-04 15:12:52 UTC (rev 11634)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-12-04 15:13:24 UTC (rev 11635)
@@ -137,7 +137,7 @@
     }
 
     int FlappyOrxShip::timeUntilRespawn(){
-        return 1-time(0)+deathTime;
+        return 2-time(0)+deathTime;
     }
 
     void FlappyOrxShip::boost(bool boost){
@@ -169,8 +169,6 @@
         isDead = true;
 
         deathTime = time(0);
-
-        //orxout()<<"death time: "<<deathTime<<std::endl;
         Vector3 pos = getPosition();
         pos.x = 0;
         pos.z = 0;

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h	2017-12-04 15:12:52 UTC (rev 11634)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h	2017-12-04 15:13:24 UTC (rev 11635)
@@ -54,8 +54,6 @@
 
             // Starts or stops fireing
             virtual void boost(bool bBoost) override;
-
-            //return to main menu if game has ended.
             
             inline void  setSpeedBase(float speedBase){ getGame()->setSpeedBase(speedBase);}
             inline float getSpeedBase(){ return getGame()->getSpeedBase();}
@@ -72,7 +70,7 @@
             inline void  setGravity( float gravity ){ this->gravity = gravity; }
             inline float getGravity(){ return this->gravity; }
 
-            inline void setSpeed( float speed ){ orxout() << "speed set: " << speed << endl; this->speed = speed; }
+            inline void setSpeed( float speed ){ this->speed = speed; }
             inline float getSpeed( ){ return this->speed; }