fix and deprecate floatToString (#887)

CBATeam · Feb 13, 2018 · 225d983 · 225d983
1 parent e5b4803
commit 225d983
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/addons/main/script_macros_common.hpp b/addons/main/script_macros_common.hpp
@@ -1081,7 +1081,7 @@ Macros: IS_x()
 #define IS_INTEGER(VAR)  (if (IS_SCALAR(VAR)) then {floor (VAR) == (VAR)} else {false})
 #define IS_NUMBER(VAR)   IS_SCALAR(VAR)
 
-#define FLOAT_TO_STRING(num)    (str parseNumber (str (_this%_this) + str floor abs _this) + "." + (str (abs _this-floor abs _this) select [2]) + "0")
+#define FLOAT_TO_STRING(num)    (if (_this == 0) then {"0"} else {str parseNumber (str (_this % _this) + str floor abs _this) + "." + (str (abs _this - floor abs _this) select [2]) + "0"})
 
 /* -------------------------------------------
 Macro: SCRIPT()

diff --git a/addons/strings/fnc_floatToString.sqf b/addons/strings/fnc_floatToString.sqf
@@ -1,6 +1,8 @@
 /* -----------------------------------------------------------------------------
 Function: CBA_fnc_floatToString
 
+DEPRECATED - Please use <toFixed at https://community.bistudio.com/wiki/toFixed> added in Arma 3 1.66
+
 Description:
     Returns a higher precision string representation of a IEEE 754 floating point
     number than the str function.
@@ -27,4 +29,4 @@ Author:
     Nou
 ---------------------------------------------------------------------------- */
 
-str parseNumber (str (_this % _this) + str floor abs _this) + "." + (str (abs _this - floor abs _this) select [2]) + "0";
+if (_this == 0) then {"0"} else {str parseNumber (str (_this % _this) + str floor abs _this) + "." + (str (abs _this - floor abs _this) select [2]) + "0"};