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

Fixes for the FCS; it was missing a lot of calls before FUNCs.

Browse Source 
That made the rangefinder only work once. The flag for preventing holding is not needed becase GVAR(enabled) serving the same purpose.
This commit is contained in:
Nicolás Badano 2015-02-15 17:43:57 -03:00
parent 08af51c4a7
commit 2105bc18db
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/fcs/functions/fnc_keyDown.sqf
View File

@ -19,7 +19,7 @@ _turret = _this select 1;
_distance = call FUNC(getRange); _distance = call FUNC(getRange);
if !(!GVAR(enabled) && FUNC(canUseFCS)) exitWith {}; if !(!GVAR(enabled) && [] call FUNC(canUseFCS)) exitWith {};
GVAR(Enabled) = true; GVAR(Enabled) = true;
GVAR(Time) = time; GVAR(Time) = time;

15
addons/fcs/initKeybinds.sqf
View File

@ -7,11 +7,7 @@
_exceptions = []; _exceptions = [];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false}; if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific // Conditions: specific
if !((!GVAR(enabled) && FUNC(canUseFCS)) || FUNC(canUseRangefinder)) exitWith {false}; if !((!GVAR(enabled) && [] call FUNC(canUseFCS)) || [] call FUNC(canUseRangefinder)) exitWith {false};
// prevent holding down
if (GETGVAR(isDownStateKey1,false)) exitWith {false};
GVAR(isDownStateKey1) = true;
// Statement // Statement
[vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyDown); [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyDown);
@ -26,14 +22,11 @@
["ACE3", ["ACE3",
localize "STR_ACE_FCS_LaseTarget", localize "STR_ACE_FCS_LaseTarget",
{ {
// prevent holding down
GVAR(isDownStateKey1) = false;
// Conditions: canInteract // Conditions: canInteract
_exceptions = []; _exceptions = [];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false}; if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(GVAR(enabled) && FUNC(canUseFCS)) exitWith {false}; if !(GVAR(enabled) && [] call FUNC(canUseFCS)) exitWith {false};
// Statement // Statement
[vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyUp); [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyUp);
@ -51,7 +44,7 @@
_exceptions = []; _exceptions = [];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false}; if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(FUNC(canUseFCS)) exitWith {false}; if !([] call FUNC(canUseFCS)) exitWith {false};
// Statement // Statement
[vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex), 50] call FUNC(adjustRange); [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex), 50] call FUNC(adjustRange);
@ -69,7 +62,7 @@
_exceptions = []; _exceptions = [];
if !(_exceptions call EGVAR(common,canInteract)) exitWith {false}; if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(FUNC(canUseFCS)) exitWith {false}; if !([] call FUNC(canUseFCS)) exitWith {false};
// Statement // Statement
[vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex), -50] call FUNC(adjustRange); [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex), -50] call FUNC(adjustRange);