Merge pull request #1333 from acemod/negativeTailwinds

Tailwinds are displayed as negative values.
This commit is contained in:
ulteq 2015-05-21 19:18:43 +02:00
commit 90ffee4ce6
2 changed files with 11 additions and 5 deletions

View File

@ -65,11 +65,17 @@ if (GVAR(MinAvgMaxMode) == 1) then {
// HEADWIND
_headwind = 0;
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
_headwind = abs(cos(GVAR(RefHeading) - _playerDir) * _windSpeed);
_headwind = cos(GVAR(RefHeading) - _playerDir) * _windSpeed;
} else {
_headwind = abs(cos(GVAR(RefHeading)) * _windSpeed);
_headwind = cos(GVAR(RefHeading)) * _windSpeed;
};
[4, _headwind] call _fnc_updateMemory;
if (abs(_headwind) > abs(GVAR(MAX) select 4)) then {
GVAR(MAX) set [4, _headwind];
};
if (abs(_headwind) < abs(GVAR(MIN) select 4)) then {
GVAR(MIN) set [4, _headwind];
};
GVAR(TOTAL) set [4, (GVAR(TOTAL) select 4) + _headwind];
};
[5, _temperature] call _fnc_updateMemory;

View File

@ -159,10 +159,10 @@ if (GVAR(referenceHeadingMenu) == 0) then {
case 4: { // HEADWIND
if (!GVAR(MinAvgMax)) then {
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
_textCenterBig = Str(round(abs(cos(GVAR(RefHeading) - _playerDir) * _windSpeed) * 10) / 10);
_textCenterBig = Str(round(cos(GVAR(RefHeading) - _playerDir) * _windSpeed * 10) / 10);
_textInfoLine1 = format["%1 m/s @ %2", round((abs(cos(_playerDir - _windDir)) * _windSpeed) * 10) / 10, round(_playerDir)];
} else {
_textCenterBig = Str(round(abs(cos(GVAR(RefHeading)) * _windSpeed) * 10) / 10);
_textCenterBig = Str(round(cos(GVAR(RefHeading)) * _windSpeed * 10) / 10);
_textInfoLine1 = format["%1 m/s @ %2", round(_windSpeed * 10) / 10, round(_windDir)];
};
_textInfoLine2 = "- set heading";