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

fix script errors

Browse Source
This commit is contained in:
commy2 2015-01-13 16:38:21 +01:00
parent 49f01a0fac
commit 9efc1f9547
9 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/attach/functions/fnc_openAttachUI.sqf
View File

@ -60,6 +60,6 @@ _attachables = items _unit;
}, },
{ {
call EFUNC(interaction,hideMenu); call EFUNC(interaction,hideMenu);
if !(profileNamespace getVariable [EQGVAR(interaction,AutoCloseMenu), false]) then {"Default" call EFUNC(interaction,openMenuSelf)}; if !(profileNamespace getVariable [QEGVAR(interaction,AutoCloseMenu), false]) then {"Default" call EFUNC(interaction,openMenuSelf)};
} }
] call EFUNC(interaction,openSelectMenu); ] call EFUNC(interaction,openSelectMenu);

6
addons/interaction/XEH_preInit.sqf
View File

@ -2,13 +2,13 @@
PREP(addInteraction); PREP(addInteraction);
PREP(addInteractionSelf); PREP(addInteractionSelf);
PREP(AddSelectableItem); PREP(addSelectableItem);
PREP(addToTooltip); PREP(addToTooltip);
PREP(applyButtons); PREP(applyButtons);
PREP(canInteractWith); PREP(canInteractWith);
PREP(canTapShoulder); PREP(canTapShoulder);
PREP(getActions);
PREP(getActions2); PREP(getActions2);
PREP(GetActions);
PREP(getDoor); PREP(getDoor);
PREP(getDoorAnimations); PREP(getDoorAnimations);
PREP(getDown); PREP(getDown);
@ -43,4 +43,4 @@ PREP(showMenu);
PREP(showMouseHint); PREP(showMouseHint);
PREP(sortOptionsByPriority); PREP(sortOptionsByPriority);
PREP(tapShoulder); PREP(tapShoulder);
PREP(updateTooltipPosition); PREP(updateTooltipPosition);

4
addons/interaction/config.cpp
View File

@ -522,8 +522,8 @@ class CfgVehicles {
class ACE_Push { class ACE_Push {
displayName = "$STR_ACE_Interaction_Push"; displayName = "$STR_ACE_Interaction_Push";
distance = 4; distance = 4;
condition = QUOTE( getMass _target < 1000 and alive _target ); condition = QUOTE(getMass _target < 1000 && {alive _target});
//statement = QUOTE( [_target, [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5]] call FUNC(push); ); statement = QUOTE([ARR_2(_target, [ARR_3(2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5)])] call FUNC(push););
showDisabled = 0; showDisabled = 0;
priority = -1; priority = -1;
}; };

2
addons/interaction/functions/fnc_GetActions.sqf
View File

@ -77,7 +77,7 @@ for "_i" from 0 to (_count - 1) do {
_condition = getText (_action >> "condition"); _condition = getText (_action >> "condition");
if (_condition == "") then {_condition = "true"}; if (_condition == "") then {_condition = "true"};
_condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ACE_player, GVAR(Target)] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")]; _condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ARR_2(ACE_player, GVAR(Target))] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")];
if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"};
_condition = compile _condition; _condition = compile _condition;

2
addons/interaction/functions/fnc_getActions2.sqf
View File

@ -45,7 +45,7 @@ _cacheIndices = _cache select 2;
_condition = getText (_action >> "condition"); _condition = getText (_action >> "condition");
if (_condition == "") then {_condition = "true"}; if (_condition == "") then {_condition = "true"};
_condition = _condition + format [QUOTE(&& {%1 call EFUNC(common,canInteract)} && {[ACE_player, GVAR(Target)] call FUNC(canInteractWith)}), getArray (_action >> "exceptions")]; _condition = _condition + format [QUOTE(&& {%1 call EFUNC(common,canInteract)} && {[ARR_2(ACE_player, GVAR(Target))] call FUNC(canInteractWith)}), getArray (_action >> "exceptions")];
if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"}; if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"};
_condition = compile _condition; _condition = compile _condition;

4
addons/interaction/functions/fnc_getCaptivityStatus.sqf
View File

@ -1,4 +0,0 @@
// by commy2
#include "script_component.hpp"
_this call EFUNC(common,getCaptivityStatus);

4
addons/interaction/functions/fnc_setCaptivityStatus.sqf
View File

@ -1,4 +0,0 @@
// by commy2
#include "script_component.hpp"
_this call EFUNC(common,setCaptivityStatus);

2
addons/interaction/functions/fnc_tapShoulder.sqf
View File

@ -9,7 +9,7 @@ _target = _this select 1;
if (_target != ACE_player) exitWith { if (_target != ACE_player) exitWith {
addCamShake [4, 0.5, 5]; addCamShake [4, 0.5, 5];
if !(local _target) then { if !(local _target) then {
[[_tapper, _target], QUOTE(FUNC(tapShoulder)), _target] call EFUNC(execRemoteFnc); [[_tapper, _target], QUOTE(FUNC(tapShoulder)), _target] call EFUNC(common,execRemoteFnc);
}; };
}; };

2
addons/switchunits/functions/fnc_switchUnit.sqf
View File

@ -48,7 +48,7 @@ _newUnit spawn {
// should switch locality // should switch locality
// This doesn't work anymore, because one's now able to switch to units from a different side // This doesn't work anymore, because one's now able to switch to units from a different side
//[_unit] joinSilent group player; //[_unit] joinSilent group player;
[[_unit, player], QUOTE({(_this select 0) setVariable [QGVAR(OriginalOwner), owner (_this select 0), true]; (_this select 0) setOwner owner (_this select 1)}), 1] call EFUNC(common,execRemoteFnc); [[_unit, player], QUOTE({(_this select 0) setVariable [ARR_3(QUOTE(QGVAR(OriginalOwner)), owner (_this select 0), true)]; (_this select 0) setOwner owner (_this select 1)}), 1] call EFUNC(common,execRemoteFnc);
_oldUnit = player; _oldUnit = player;
waitUntil {sleep 0.2; local _unit}; waitUntil {sleep 0.2; local _unit};