Changeset 11739 for code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h

Timestamp:

Feb 12, 2018, 12:17:34 AM (7 years ago)

Author:

landauf

Message:

[AsteroidMining_HS17] fixed a bunch of compiler warnings

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) (2 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h

@@ -94 +94 @@
             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, const btCollisionShape* cs, float damage, float healthdamage = 0.0f, float shielddamage = 0.0f);
 
-            void setSize(int s);
-            inline int getSize(){return this->size;}
+            void setSize(float s);
+            inline float getSize(){return this->size;}
 
             inline void setShattering(bool b){this->generateSmaller = b;}
@@ -105 +105 @@
         protected:
 
-            int size; //!< Implies health and type of dropped pickups
+            float size; //!< Implies health and type of dropped pickups
             bool generateSmaller; //!< Whether this asteroid leaves fragments
             bool dropStuff; //!< Whether this asteroid yields valuable stuff