Merge pull request #214 from CBATeam/fixNegativeFormatNumberDecimals

Fix FormatNumber Decimals with Negative Numbers
CBATeam · Dec 11, 2015 · f2f0149 · f2f0149
2 parents b3ec002 + 72f8ec0
commit f2f0149
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/addons/strings/fnc_formatNumber.sqf b/addons/strings/fnc_formatNumber.sqf
@@ -115,6 +115,9 @@ if (_number < 0) then {
 if (_decimalPlaces > 0) then {
     private ["_digit", "_multiplier", "_i"];
 
+    //Use abs to prevent extra `-` signs and so floor doesn't get wrong value
+    _number = abs _number;
+
     _string = _string + _decimalPoint;
 
     _multiplier = 10;

diff --git a/addons/strings/test_strings.sqf b/addons/strings/test_strings.sqf
@@ -231,6 +231,12 @@ TEST_OP(_str,==,"012",_fn);
 _str = [-12] call CBA_fnc_formatNumber;
 TEST_OP(_str,==,"-12",_fn);
 
+_str = [-12.75] call CBA_fnc_formatNumber;
+TEST_OP(_str,==,"-13",_fn);
+
+_str = [-12.75,0,3] call CBA_fnc_formatNumber;
+TEST_OP(_str,==,"-12.750",_fn);
+
 // ----------------------------------------------------------------------------
 // UNIT TESTS (elaspsedTime)
 _fn = "CBA_fnc_formatElapsedTime";