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

Scopes - Fixed MRAD conversion (#5651)

Browse Source 
* Same issue as https://github.com/acemod/ACE3/pull/5640
This commit is contained in:
ulteq
2017-10-22 10:44:00 +02:00
committed by GitHub
parent 0aca46d7aa
commit 3484942680
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/scopes/functions/fnc_applyScopeAdjustment.sqf
View File

@ -34,7 +34,7 @@ playSound selectRandom ["ACE_Scopes_Click_1", "ACE_Scopes_Click_2", "ACE_Scopes_
// slightly rotate the player if looking through optic // slightly rotate the player if looking through optic
if (cameraView == "GUNNER") then { if (cameraView == "GUNNER") then {
// Convert adjustmentDifference from mils to degrees // Convert adjustmentDifference from mils to degrees
_adjustmentDifference = _adjustmentDifference apply {_x * 0.05625}; _adjustmentDifference = _adjustmentDifference apply {MRAD_TO_DEG(_x)};
_adjustmentDifference params ["_elevationDifference", "_windageDifference"]; _adjustmentDifference params ["_elevationDifference", "_windageDifference"];
private _pitchBankYaw = [_unit] call EFUNC(common,getPitchBankYaw); private _pitchBankYaw = [_unit] call EFUNC(common,getPitchBankYaw);
_pitchBankYaw params ["_pitch", "_bank", "_yaw"]; _pitchBankYaw params ["_pitch", "_bank", "_yaw"];

2
addons/scopes/functions/fnc_firedEH.sqf
View File

@ -28,7 +28,7 @@ private _zeroing = +(_adjustment select _weaponIndex);
TRACE_1("Adjusting With",_zeroing); TRACE_1("Adjusting With",_zeroing);
// Convert zeroing from mils to degrees // Convert zeroing from mils to degrees
_zeroing = _zeroing vectorMultiply 0.05625; _zeroing = _zeroing vectorMultiply MRAD_TO_DEG(1);
if (GVAR(correctZeroing)) then { if (GVAR(correctZeroing)) then {
private _advancedBallistics = missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]; private _advancedBallistics = missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false];

2
addons/scopes/script_component.hpp
View File

@ -22,4 +22,6 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_SCOPES #define DEBUG_SETTINGS DEBUG_SETTINGS_SCOPES
#endif #endif
#define MRAD_TO_DEG(d) (d / 17.45329252) // Conversion factor: 9 / (50 * PI)
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"