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

Fix Heading Mils

Browse Source
This commit is contained in:
PabstMirror 2015-04-05 14:48:26 -05:00
parent 0281897a3d
commit 34a86e0db3
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mk6mortar/CfgVehicles.hpp
View File

@ -40,7 +40,7 @@ class CfgVehicles {
defaultValue = 1; defaultValue = 1;
}; };
class allowComputerRangefinder { class allowComputerRangefinder {
displayName = "Allow MK6 Computer/Rangefinder"; displayName = "Allow MK6 Computer";
description = "Show the Computer and Rangefinder (these should be removed if you enable air resistance)"; description = "Show the Computer and Rangefinder (these should be removed if you enable air resistance)";
typeName = "BOOL"; typeName = "BOOL";
defaultValue = 0; defaultValue = 0;

9
addons/mk6mortar/RscInGameUI.hpp
View File

@ -11,18 +11,17 @@ class RscInGameUI {
class ACE_MILS_GROUP: CA_IGUI_elements_group { class ACE_MILS_GROUP: CA_IGUI_elements_group {
idc = 80170; idc = 80170;
class controls { class controls {
class CA_Heading_MILS: RscText class CA_Heading_MILS: RscText {
{
idc = 80156; idc = 80156;
style = 0; style = 2;
colorText[] = {0.706,0.0745,0.0196,1}; colorText[] = {0.706,0.0745,0.0196,1};
sizeEx = "0.028*SafezoneH"; sizeEx = "0.028*SafezoneH";
shadow = 0; shadow = 0;
font = "EtelkaMonospacePro"; font = "EtelkaMonospacePro";
text = "015"; text = "015";
x = "25.3 * (0.01875 * SafezoneH)"; x = "25.0 * (0.01875 * SafezoneH)";
y = "6.3 * (0.025 * SafezoneH)"; y = "6.3 * (0.025 * SafezoneH)";
w = "2.2 * (0.01875 * SafezoneH)"; w = "3.3333 * (0.01875 * SafezoneH)";
h = "1 * (0.025 * SafezoneH)"; h = "1 * (0.025 * SafezoneH)";
}; };
class CA_Elev_MILS: RscText { class CA_Elev_MILS: RscText {

6
addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
View File

@ -84,11 +84,11 @@ _fireModes = getArray (configFile >> "CfgWeapons" >> _tubeWeaponName >> "modes")
if (!GVAR(allowCompass)) then { if (!GVAR(allowCompass)) then {
(_display displayCtrl 80156) ctrlSetText ""; (_display displayCtrl 80156) ctrlSetText "";
} else { } else {
_elevDeg = parseNumber ctrlText (_display displayCtrl 156); _rotationDegrees = ((getDir _mortarVeh) + (((-180 / PI) * (_mortarVeh animationPhase "mainTurret")) + 360)) % 360;
if (GVAR(useMils)) then { if (GVAR(useMils)) then {
(_display displayCtrl 80156) ctrlSetText str round (_elevDeg * 6400 / 360); (_display displayCtrl 80156) ctrlSetText str round (_rotationDegrees * 6400 / 360);
} else { } else {
(_display displayCtrl 80156) ctrlSetText str _elevDeg; (_display displayCtrl 80156) ctrlSetText str _rotationDegrees;
}; };
}; };
}; };

2
addons/mk6mortar/functions/fnc_turretDisplayLoaded.sqf
View File

@ -54,7 +54,7 @@ _fnc_hideControl = {
}; };
{ {
[_x, GVAR(disableComputerRangefinder)] call _fnc_hideControl; [_x, (!GVAR(allowComputerRangefinder))] call _fnc_hideControl;
} forEach [CTRL_CA_OPTICSPITCH, CTRL_CA_OPTICSZOOM, CTRL_CA_SOLUTION_TEXT, CTRL_CA_DISTANCE_TEXT, CTRL_CA_DISTANCE, CTRL_CA_TIME_TEXT, CTRL_CA_TIME, CTRL_CA_ELEV_NEED_TEXT, CTRL_CA_RANGEELEMENTS_GROUP]; } forEach [CTRL_CA_OPTICSPITCH, CTRL_CA_OPTICSZOOM, CTRL_CA_SOLUTION_TEXT, CTRL_CA_DISTANCE_TEXT, CTRL_CA_DISTANCE, CTRL_CA_TIME_TEXT, CTRL_CA_TIME, CTRL_CA_ELEV_NEED_TEXT, CTRL_CA_RANGEELEMENTS_GROUP];
//Always hide these, handled by the mil convertions PFEH in handlePlayerVehChanged //Always hide these, handled by the mil convertions PFEH in handlePlayerVehChanged