From c73aff03bd827463913e9384373e2c298c189537 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Mon, 6 Apr 2015 00:13:43 -0300 Subject: [PATCH] displayWindInfo tab to space --- .../weather/functions/fnc_displayWindInfo.sqf | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/addons/weather/functions/fnc_displayWindInfo.sqf b/addons/weather/functions/fnc_displayWindInfo.sqf index f821e7df52..707647620c 100644 --- a/addons/weather/functions/fnc_displayWindInfo.sqf +++ b/addons/weather/functions/fnc_displayWindInfo.sqf @@ -6,66 +6,66 @@ private ["_windSpeed", "_windDir", "_playerDir", "_windIndex", "_windColor", "_newWindSpeed", "_windSource", "_height"]; if (GVAR(WindInfo)) exitWith { - GVAR(WindInfo) = false; - 0 cutText ["", "PLAIN"]; - true + GVAR(WindInfo) = false; + 0 cutText ["", "PLAIN"]; + true }; if (underwater ACE_player) exitWith { true }; if (vehicle ACE_player != ACE_player) exitWith { true }; [] spawn { - 2 cutText ["", "PLAIN"]; - GVAR(Protractor) = false; - 1 cutText ["", "PLAIN"]; - GVAR(WindInfo) = true; + 2 cutText ["", "PLAIN"]; + GVAR(Protractor) = false; + 1 cutText ["", "PLAIN"]; + GVAR(WindInfo) = true; - while {GVAR(WindInfo) && !(underwater ACE_player) && vehicle ACE_player == ACE_player} do { - _windIndex = 12; - _windColor = [1, 1, 1, 1]; + while {GVAR(WindInfo) && !(underwater ACE_player) && vehicle ACE_player == ACE_player} do { + _windIndex = 12; + _windColor = [1, 1, 1, 1]; - // Toogle behaviour depending on ace_advanced_ballistics being used or not - // @todo, check ACE_AB is actually enabled - _windSpeed = if (isClass (configFile >> "CfgPatches" >> "ACE_Advanced_Ballistics")) then { - (eyePos ACE_player) call FUNC(calculateWindSpeed); - } else { - vectorMagnitude ACE_wind; - }; + // Toogle behaviour depending on ace_advanced_ballistics being used or not + // @todo, check ACE_AB is actually enabled + _windSpeed = if (isClass (configFile >> "CfgPatches" >> "ACE_Advanced_Ballistics")) then { + (eyePos ACE_player) call FUNC(calculateWindSpeed); + } else { + vectorMagnitude ACE_wind; + }; - if (_windSpeed > 0.2) then { - _playerDir = getDir ACE_player; - _windDir = (ACE_wind select 0) atan2 (ACE_wind select 1); - _windIndex = round(((_playerDir - _windDir + 360) % 360) / 30); - _windIndex = _windIndex % 12; - }; + if (_windSpeed > 0.2) then { + _playerDir = getDir ACE_player; + _windDir = (ACE_wind select 0) atan2 (ACE_wind select 1); + _windIndex = round(((_playerDir - _windDir + 360) % 360) / 30); + _windIndex = _windIndex % 12; + }; - // Color Codes from https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale - if (_windSpeed > 0.3) then { _windColor = [0.796, 1, 1, 1]; }; - if (_windSpeed > 1.5) then { _windColor = [0.596, 0.996, 0.796, 1]; }; - if (_windSpeed > 3.3) then { _windColor = [0.596, 0.996, 0.596, 1]; }; - if (_windSpeed > 5.4) then { _windColor = [0.6, 0.996, 0.4, 1]; }; - if (_windSpeed > 7.9) then { _windColor = [0.6, 0.996, 0.047, 1]; }; - if (_windSpeed > 10.7) then { _windColor = [0.8, 0.996, 0.059, 1]; }; - if (_windSpeed > 13.8) then { _windColor = [1, 0.996, 0.067, 1]; }; - if (_windSpeed > 17.1) then { _windColor = [1, 0.796, 0.051, 1]; }; - if (_windSpeed > 20.7) then { _windColor = [1, 0.596, 0.039, 1]; }; - if (_windSpeed > 24.4) then { _windColor = [1, 0.404, 0.031, 1]; }; - if (_windSpeed > 28.4) then { _windColor = [1, 0.22, 0.027, 1]; }; - if (_windSpeed > 32.6) then { _windColor = [1, 0.078, 0.027, 1]; }; + // Color Codes from https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale + if (_windSpeed > 0.3) then { _windColor = [0.796, 1, 1, 1]; }; + if (_windSpeed > 1.5) then { _windColor = [0.596, 0.996, 0.796, 1]; }; + if (_windSpeed > 3.3) then { _windColor = [0.596, 0.996, 0.596, 1]; }; + if (_windSpeed > 5.4) then { _windColor = [0.6, 0.996, 0.4, 1]; }; + if (_windSpeed > 7.9) then { _windColor = [0.6, 0.996, 0.047, 1]; }; + if (_windSpeed > 10.7) then { _windColor = [0.8, 0.996, 0.059, 1]; }; + if (_windSpeed > 13.8) then { _windColor = [1, 0.996, 0.067, 1]; }; + if (_windSpeed > 17.1) then { _windColor = [1, 0.796, 0.051, 1]; }; + if (_windSpeed > 20.7) then { _windColor = [1, 0.596, 0.039, 1]; }; + if (_windSpeed > 24.4) then { _windColor = [1, 0.404, 0.031, 1]; }; + if (_windSpeed > 28.4) then { _windColor = [1, 0.22, 0.027, 1]; }; + if (_windSpeed > 32.6) then { _windColor = [1, 0.078, 0.027, 1]; }; - 0 cutRsc ["RscWindIntuitive", "PLAIN", 1, false]; + 0 cutRsc ["RscWindIntuitive", "PLAIN", 1, false]; - __ctrl ctrlSetScale 0.75; - __ctrl ctrlCommit 0; + __ctrl ctrlSetScale 0.75; + __ctrl ctrlCommit 0; - __ctrl ctrlSetText format[QUOTE(PATHTOF(UI\wind%1.paa)), _windIndex]; - __ctrl ctrlSetTextColor _windColor; + __ctrl ctrlSetText format[QUOTE(PATHTOF(UI\wind%1.paa)), _windIndex]; + __ctrl ctrlSetTextColor _windColor; - sleep 0.5; - }; + sleep 0.5; + }; - GVAR(WindInfo) = false; - 0 cutText ["", "PLAIN"]; + GVAR(WindInfo) = false; + 0 cutText ["", "PLAIN"]; }; true