Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4113 from acemod/microdagr-zero-fixes

Browse Source 
Fixed MicroDAGR trailing zero
This commit is contained in:
bux578 2016-07-14 15:28:11 +02:00 committed by GitHub
commit 0dcc89251c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/microdagr/functions/fnc_updateDisplay.sqf
View File

@ -1,4 +1,4 @@
/* /*
* Author: PabstMirror * Author: PabstMirror
* Updates the display (several times a second) called from the pfeh * Updates the display (several times a second) called from the pfeh
* *
@ -49,7 +49,7 @@ case (APP_MODE_INFODISPLAY): {
_compassAngleText = if (GVAR(settingUseMils)) then { _compassAngleText = if (GVAR(settingUseMils)) then {
[(floor ((6400 / 360) * (([ACE_player] call CBA_fnc_headDir) select 0))), 4, 0] call CBA_fnc_formatNumber; [(floor ((6400 / 360) * (([ACE_player] call CBA_fnc_headDir) select 0))), 4, 0] call CBA_fnc_formatNumber;
} else { } else {
([(floor (([ACE_player] call CBA_fnc_headDir) select 0)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8 ([([ACE_player] call CBA_fnc_headDir) select 0, 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
}; };
(_display displayCtrl IDC_MODEDISPLAY_HEADINGNUM) ctrlSetText _compassAngleText; (_display displayCtrl IDC_MODEDISPLAY_HEADINGNUM) ctrlSetText _compassAngleText;
@ -89,7 +89,7 @@ case (APP_MODE_INFODISPLAY): {
_bearingText = if (GVAR(settingUseMils)) then { _bearingText = if (GVAR(settingUseMils)) then {
[(floor ((6400 / 360) * (_bearing))), 4, 0] call CBA_fnc_formatNumber; [(floor ((6400 / 360) * (_bearing))), 4, 0] call CBA_fnc_formatNumber;
} else { } else {
([(floor (_bearing)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8 ([_bearing, 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
}; };
_2dDistanceKm = ((getPosASL ACE_player) distance2D _targetPosLocationASL) / 1000; _2dDistanceKm = ((getPosASL ACE_player) distance2D _targetPosLocationASL) / 1000;
_rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)]; _rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)];
@ -109,7 +109,7 @@ case (APP_MODE_COMPASS): {
_compassAngleText = if (GVAR(settingUseMils)) then { _compassAngleText = if (GVAR(settingUseMils)) then {
[(floor ((6400 / 360) * (([ACE_player] call CBA_fnc_headDir) select 0))), 4, 0] call CBA_fnc_formatNumber; [(floor ((6400 / 360) * (([ACE_player] call CBA_fnc_headDir) select 0))), 4, 0] call CBA_fnc_formatNumber;
} else { } else {
([(floor (([ACE_player] call CBA_fnc_headDir) select 0)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8 ([([ACE_player] call CBA_fnc_headDir) select 0, 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
}; };
(_display displayCtrl IDC_MODECOMPASS_HEADING) ctrlSetText _compassAngleText; (_display displayCtrl IDC_MODECOMPASS_HEADING) ctrlSetText _compassAngleText;
@ -145,7 +145,7 @@ case (APP_MODE_COMPASS): {
_bearingText = if (GVAR(settingUseMils)) then { _bearingText = if (GVAR(settingUseMils)) then {
[(floor ((6400 / 360) * (_bearing))), 4, 0] call CBA_fnc_formatNumber; [(floor ((6400 / 360) * (_bearing))), 4, 0] call CBA_fnc_formatNumber;
} else { } else {
([(floor (_bearing)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8 ([_bearing, 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
}; };
_2dDistanceKm = ((getPosASL ACE_player) distance2D _targetPosLocationASL) / 1000; _2dDistanceKm = ((getPosASL ACE_player) distance2D _targetPosLocationASL) / 1000;
_rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)]; _rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)];