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

#1187 - canInteractWith was failing vehicle actions

Browse Source
This commit is contained in:
PabstMirror 2015-05-14 14:59:59 -05:00
parent e76db653e8
commit 03130ab3c9
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
addons/weaponselect/XEH_postInit.sqf
View File

@ -16,7 +16,7 @@ if !(hasInterface) exitWith {};
false false
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 1 Key)
["ACE3 Weapons", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle", ["ACE3 Weapons", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle",
{ {
@ -30,7 +30,7 @@ if !(hasInterface) exitWith {};
false false
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 2 Key)
["ACE3 Weapons", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle", ["ACE3 Weapons", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
{ {
@ -44,7 +44,7 @@ if !(hasInterface) exitWith {};
false false
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 3 Key)
["ACE3 Weapons", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher", ["ACE3 Weapons", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher",
{ {
@ -58,7 +58,7 @@ if !(hasInterface) exitWith {};
false false
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 4 Key)
["ACE3 Weapons", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular", ["ACE3 Weapons", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular",
{ {
@ -72,7 +72,7 @@ if !(hasInterface) exitWith {};
false false
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 5 Key)
["ACE3 Weapons", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag", ["ACE3 Weapons", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag",
{ {
@ -119,9 +119,9 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn", ["ACE3 Vehicles", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {!isEngineOn vehicle ACE_player}) exitWith {false}; if !((ACE_player != vehicle ACE_player) && {ACE_player == driver vehicle ACE_player} && {!isEngineOn vehicle ACE_player}) exitWith {false};
// Statement // Statement
(vehicle ACE_player) engineOn true; (vehicle ACE_player) engineOn true;
@ -133,7 +133,7 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff", ["ACE3 Vehicles", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {isEngineOn vehicle ACE_player}) exitWith {false}; if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {isEngineOn vehicle ACE_player}) exitWith {false};
@ -147,49 +147,49 @@ if !(hasInterface) exitWith {};
["ACE3 Vehicles", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun", ["ACE3 Vehicles", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player) exitWith {false}; if !(ACE_player != vehicle ACE_player) exitWith {false};
// Statement // Statement
[ACE_player, vehicle ACE_player, 0] call FUNC(selectWeaponVehicle); [ACE_player, vehicle ACE_player, 0] call FUNC(selectWeaponVehicle);
false true
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 3 Key)
["ACE3 Vehicles", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun", ["ACE3 Vehicles", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player) exitWith {false}; if !(ACE_player != vehicle ACE_player) exitWith {false};
// Statement // Statement
[ACE_player, vehicle ACE_player, 1] call FUNC(selectWeaponVehicle); [ACE_player, vehicle ACE_player, 1] call FUNC(selectWeaponVehicle);
false true
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 4 Key)
["ACE3 Vehicles", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles", ["ACE3 Vehicles", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player) exitWith {false}; if !(ACE_player != vehicle ACE_player) exitWith {false};
// Statement // Statement
[ACE_player, vehicle ACE_player, 2] call FUNC(selectWeaponVehicle); [ACE_player, vehicle ACE_player, 2] call FUNC(selectWeaponVehicle);
false true
}, },
{false}, {false},
[0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 5 Key)
["ACE3 Vehicles", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher", ["ACE3 Vehicles", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher",
{ {
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player != vehicle ACE_player && {ACE_player == commander vehicle ACE_player}) exitWith {false}; if !(ACE_player != vehicle ACE_player && {ACE_player == commander vehicle ACE_player}) exitWith {false};