mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
fix: derp when switching control numbers
This commit is contained in:
parent
8255ff666d
commit
ebd1e555a3
@ -30,75 +30,6 @@ _digit4 = _number mod 10;
|
||||
switch (_coordinate) do {
|
||||
case 0 : {
|
||||
|
||||
if (_isNegative) then {
|
||||
|
||||
if (_digit1 == 0) then {
|
||||
if (_digit2 == 0) then {
|
||||
if (_digit3 == 0) then {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_d.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
_digit3 = "";
|
||||
_digit4 = "";
|
||||
} else {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_d.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit3];
|
||||
_digit3 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
_digit4 = "";
|
||||
};
|
||||
} else {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_d.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit2];
|
||||
_digit3 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit3];
|
||||
_digit4 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
};
|
||||
} else {
|
||||
_digit0 = "";
|
||||
_digit1 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit2 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit3 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit4 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
};
|
||||
|
||||
} else {
|
||||
|
||||
if (_digit1 == 0) then {
|
||||
if (_digit2 == 0) then {
|
||||
if (_digit3 == 0) then {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_a.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
_digit3 = "";
|
||||
_digit4 = "";
|
||||
} else {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_a.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit3];
|
||||
_digit3 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
_digit4 = "";
|
||||
};
|
||||
} else {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_a.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit2];
|
||||
_digit3 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit3];
|
||||
_digit4 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
};
|
||||
} else {
|
||||
_digit0 = "";
|
||||
_digit1 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit2 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit3 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit4 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
case 1 : {
|
||||
|
||||
if (_isNegative) then {
|
||||
|
||||
if (_digit1 == 0) then {
|
||||
@ -166,6 +97,75 @@ switch (_coordinate) do {
|
||||
|
||||
};
|
||||
|
||||
case 1 : {
|
||||
|
||||
if (_isNegative) then {
|
||||
|
||||
if (_digit1 == 0) then {
|
||||
if (_digit2 == 0) then {
|
||||
if (_digit3 == 0) then {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_d.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
_digit3 = "";
|
||||
_digit4 = "";
|
||||
} else {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_d.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit3];
|
||||
_digit3 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
_digit4 = "";
|
||||
};
|
||||
} else {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_d.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit2];
|
||||
_digit3 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit3];
|
||||
_digit4 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
};
|
||||
} else {
|
||||
_digit0 = "";
|
||||
_digit1 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit2 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit3 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit4 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
};
|
||||
|
||||
} else {
|
||||
|
||||
if (_digit1 == 0) then {
|
||||
if (_digit2 == 0) then {
|
||||
if (_digit3 == 0) then {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_a.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
_digit3 = "";
|
||||
_digit4 = "";
|
||||
} else {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_a.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit3];
|
||||
_digit3 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
_digit4 = "";
|
||||
};
|
||||
} else {
|
||||
_digit0 = QUOTE(PATHTOF(rsc\vector_a.paa));
|
||||
_digit1 = "";
|
||||
_digit2 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit2];
|
||||
_digit3 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit3];
|
||||
_digit4 = format [QUOTE(PATHTOF(rsc\vector_%1.paa)), _digit4];
|
||||
};
|
||||
} else {
|
||||
_digit0 = "";
|
||||
_digit1 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit2 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit3 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
_digit4 = QUOTE(PATHTOF(rsc\vector_minus.paa));
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
case 2 : {
|
||||
|
||||
if (_isNegative) then {
|
||||
|
@ -15,8 +15,8 @@ _inclinationP2 = _directionP2 select 1;
|
||||
|
||||
private ["_abscissa", "_ordinate", "_applicate"];
|
||||
|
||||
_abscissa = _distanceP1 * cos (_inclinationP1 - _inclinationP2) - _distanceP2 * cos (_azimuthP1 - _azimuthP2);
|
||||
_ordinate = _distanceP1 * sin (_azimuthP1 - _azimuthP2);
|
||||
_abscissa = _distanceP1 * sin (_azimuthP1 - _azimuthP2);
|
||||
_ordinate = _distanceP1 * cos (_inclinationP1 - _inclinationP2) - _distanceP2 * cos (_azimuthP1 - _azimuthP2);
|
||||
_applicate = (sin _inclinationP2 * _distanceP2) - (sin _inclinationP1 * _distanceP1);
|
||||
|
||||
if (_distanceP1 < -999 || {_distanceP2 < -999}) exitWith {
|
||||
|
@ -207,7 +207,7 @@ switch (_this select 0) do {
|
||||
|
||||
if (!GVAR(isKeyDownAzimuth) && {!GVAR(isKeyDownDistance)}) then {
|
||||
if (_isReady) then {
|
||||
GVAR(FOSData) = call FUNC(getFallOfShot);//
|
||||
GVAR(FOSData) = call FUNC(getFallOfShot);
|
||||
[false] call FUNC(showFallOfShot);
|
||||
};
|
||||
[false] call FUNC(showCenter);
|
||||
|
Loading…
Reference in New Issue
Block a user