Changeset 11755 for code/branches/Presentation_HS17_merge/src/modules/flappyorx/FlappyOrx.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/FlappyOrx.h (modified) (4 diffs)

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

@@ -46 +46 @@
 {
     struct Circle{
-        int r;
-        int x;
-        int y;
-        Circle(int new_r, int new_x, int new_y){
+        float r;
+        float x;
+        float y;
+        Circle(float new_r, float new_x, float new_y){
             r=new_r;
             x=new_x;
@@ -70 +70 @@
             virtual void death();
            
-            void updatePlayerPos(int x);
+            void updatePlayerPos(float x);
             void createAsteroid(Circle &c);
-            void asteroidField(int x, int y, float slope);
+            void asteroidField(float x, float y, float slope);
             void spawnTube();
             
@@ -89 +89 @@
             float speedIncrease;
 
-            int tubeDistanceBase;
-            int tubeDistanceIncrease;
-            int tubeDistance;
-            int tubeOffsetX;
+            float tubeDistanceBase;
+            float tubeDistanceIncrease;
+            float tubeDistance;
+            float tubeOffsetX;
 
             int upwardThrust;
             int gravity;
 
-            inline void setSpeedBase(int speedBase){ this-> speedBase =  speedBase;}
+            inline void setSpeedBase(float speedBase){ this-> speedBase =  speedBase;}
             inline float  getSpeedBase(){ return speedBase;}
-            inline void setSpeedIncrease(int speedIncrease){ this-> speedIncrease =  speedIncrease;}
+            inline void setSpeedIncrease(float speedIncrease){ this-> speedIncrease =  speedIncrease;}
             inline float  getSpeedIncrease(){ return speedIncrease;}
 
-            inline void setTubeDistanceBase(int tubeDistanceBase){ this-> tubeDistanceBase =  tubeDistanceBase;}
-            inline int  getTubeDistanceBase(){ return tubeDistanceBase;}
-            inline void setTubeDistanceIncrease(int tubeDistanceIncrease){ this-> tubeDistanceIncrease =  tubeDistanceIncrease;}
-            inline int  getTubeDistanceIncrease(){ return tubeDistanceIncrease;}
+            inline void setTubeDistanceBase(float tubeDistanceBase){ this-> tubeDistanceBase =  tubeDistanceBase;}
+            inline float  getTubeDistanceBase(){ return tubeDistanceBase;}
+            inline void setTubeDistanceIncrease(float tubeDistanceIncrease){ this-> tubeDistanceIncrease =  tubeDistanceIncrease;}
+            inline float  getTubeDistanceIncrease(){ return tubeDistanceIncrease;}
 
             
@@ -112 +112 @@
             bool firstGame;
             std::string sDeathMessage;
-            std::queue<int> tubes;                  //Saves Position of Tubes
+            std::queue<float> tubes;                  //Saves Position of Tubes
             std::queue<MovableEntity*> asteroids;   //Stores Asteroids which build up the tubes
             float speed = 100;