Deprecate common function numberToDigitsString (#6007)

* Deprecate common function numberToDigitsString
This commit is contained in:
SilentSpike 2018-01-02 17:00:01 +00:00 committed by GitHub
parent 966cf8d748
commit 33e25535c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 38 deletions

View File

@ -1,5 +1,5 @@
/* /*
* Author: commy2 * Author: commy2, SilentSpike
* Transforms a number to an array of the correspondending digits. * Transforms a number to an array of the correspondending digits.
* *
* Arguments: * Arguments:
@ -18,24 +18,6 @@
params ["_number", "_minLength"]; params ["_number", "_minLength"];
_number = _number min 999999; _number = [_number min 999999, _minLength] call CBA_fnc_formatNumber;
_number = str _number;
private _length = count _number; (_number splitString "") apply { parseNumber _x }
if (isNil "_minLength") then {_minLength = _length};
_minLength = _minLength min 6;
while {_length < _minLength} do {
_number = "0" + _number;
_length = _length + 1;
};
private _digits = [];
for "_x" from 0 to (_length - 1) do {
_digits pushBack parseNumber (_number select [_x, 1]);
};
_digits

View File

@ -16,20 +16,6 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
params ["_number", "_minLength"]; ACE_DEPRECATED(QFUNC(numberToDigitsString),"3.14.0","CBA_fnc_formatNumber");
_number = _number min 999999; _this call CBA_fnc_formatNumber
_number = str _number;
private _length = count _number;
if (isNil "_minLength") then {_minLength = _length};
_minLength = _minLength min 6;
while {_length < _minLength} do {
_number = "0" + _number;
_length = _length + 1;
};
_number

View File

@ -40,7 +40,7 @@ GVAR(AltimeterActive) = true;
private _timeDiff = _curTime - _prevTime; private _timeDiff = _curTime - _prevTime;
private _descentRate = if (_timeDiff > 0) then {floor((_oldHeight - _height) / _timeDiff)} else {0}; private _descentRate = if (_timeDiff > 0) then {floor((_oldHeight - _height) / _timeDiff)} else {0};
_TimeText ctrlSetText (format ["%1:%2",[_hour, 2] call EFUNC(common,numberToDigitsString),[_minute, 2] call EFUNC(common,numberToDigitsString)]); _TimeText ctrlSetText (format ["%1:%2", [_hour, 2] call CBA_fnc_formatNumber, [_minute, 2] call CBA_fnc_formatNumber]);
_HeightText ctrlSetText (format ["%1", floor _height]); _HeightText ctrlSetText (format ["%1", floor _height]);
_DecendRate ctrlSetText (format ["%1", _descentRate max 0]); _DecendRate ctrlSetText (format ["%1", _descentRate max 0]);