Merge pull request #461 from niffiwan/fix/cm_float_int

CMEASURE_DETONATE_DISTANCE should be a float

Author: Goober5000

code/cmeasure/cmeasure.cpp

@@ -21,7 +21,7 @@
 
 int	Cmeasures_homing_check = 0;
 int	Countermeasures_enabled = 1;			//	Debug, set to 0 means no one can fire countermeasures.
-const int CMEASURE_DETONATE_DISTANCE = 40.0f;
+const float CMEASURE_DETONATE_DISTANCE = 40.0f;
 
 //Used to set a countermeasure velocity after being launched from a ship as a countermeasure
 //ie not as a primary or secondary.

code/cmeasure/cmeasure.h

@@ -22,7 +22,7 @@ class object;
 //	Maximum distance at which a countermeasure can be tracked
 //	If this value is too large, missiles will always be tracking countermeasures.
 #define	MAX_CMEASURE_TRACK_DIST	300.0f
-extern const int CMEASURE_DETONATE_DISTANCE;
+extern const float CMEASURE_DETONATE_DISTANCE;
 
 extern int Cmeasures_homing_check;
 extern int Countermeasures_enabled;