Changeset 11755 for code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h

Timestamp:

Feb 16, 2018, 12:37:37 AM (7 years ago)

Author:

landauf

Message:

[FlappyOrx_HS17] fixed some warnings (MSVC)

File:

• code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h (modified) (3 diffs)

code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrxShip.h

@@ -58 +58 @@
             inline void  setSpeedBase(float speedBase){ getGame()->setSpeedBase(speedBase);}
             inline float getSpeedBase(){ return getGame()->getSpeedBase();}
-            inline void  setSpeedIncrease(int speedIncrease){ getGame()->setSpeedIncrease(speedIncrease);}
+            inline void  setSpeedIncrease(float speedIncrease){ getGame()->setSpeedIncrease(speedIncrease);}
             inline float getSpeedIncrease(){ return getGame()->getSpeedIncrease();}
 
-            inline void setTubeDistanceBase(int tubeDistanceBase){ getGame()->setTubeDistanceBase(tubeDistanceBase);}
-            inline int  getTubeDistanceBase(){ return getGame()->getTubeDistanceBase();}
-            inline void setTubeDistanceIncrease(int tubeDistanceIncrease){ getGame()->setTubeDistanceIncrease(tubeDistanceIncrease);}
-            inline int  getTubeDistanceIncrease(){ return getGame()->getTubeDistanceIncrease();}
+            inline void setTubeDistanceBase(float tubeDistanceBase){ getGame()->setTubeDistanceBase(tubeDistanceBase);}
+            inline float  getTubeDistanceBase(){ return getGame()->getTubeDistanceBase();}
+            inline void setTubeDistanceIncrease(float tubeDistanceIncrease){ getGame()->setTubeDistanceIncrease(tubeDistanceIncrease);}
+            inline float  getTubeDistanceIncrease(){ return getGame()->getTubeDistanceIncrease();}
 
             inline void  setUpwardthrust( float upwardThrust ){ this->upwardThrust = upwardThrust; }
@@ -75 +75 @@
             
    
-            virtual int timeUntilRespawn();
+            virtual time_t timeUntilRespawn();
             
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -91 +91 @@
             float speed, upwardThrust, gravity;
             float particleAge, particleLifespan;
-            long deathTime;
+            time_t deathTime;
             struct Velocity
             {