From 9e11aeb0b9c13bb8f1417a05c0cf7295c2ab02be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Tue, 20 Jan 2015 02:39:22 -0300 Subject: [PATCH] interaction: fix canInteract and exceptions in agm menu --- .../common/scripts/KeyInput/initCanInteractFunction.sqf | 2 +- addons/interaction/config.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/common/scripts/KeyInput/initCanInteractFunction.sqf b/addons/common/scripts/KeyInput/initCanInteractFunction.sqf index d718be04fe..a0a6eb787f 100644 --- a/addons/common/scripts/KeyInput/initCanInteractFunction.sqf +++ b/addons/common/scripts/KeyInput/initCanInteractFunction.sqf @@ -5,7 +5,7 @@ private ["_function", "_configFile", "_count", "_index", "_config", "_configName _function = "private '_exceptions'; _exceptions = _this; alive ACE_player"; -_configFile = configFile >> QGVAR(canInteractConditions); +_configFile = configFile >> "ACE_canInteractConditions"; _count = count _configFile; for "_index" from 0 to (_count -1) do { diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp index 3b82fc60f4..fe90476a2e 100644 --- a/addons/interaction/config.cpp +++ b/addons/interaction/config.cpp @@ -98,15 +98,15 @@ class ACE_Parameters_Boolean { class ACE_canInteractConditions { class GVAR(isNotEscorting) { - condition = QUOTE( !(_player getVariable ['ACE_isEscorting', false]) ); + condition = QUOTE( !(ACE_player getVariable [ARR_2('ACE_isEscorting', false)]) ); }; class GVAR(isNotCaptive) { - condition = QUOTE( !(_player getVariable ['ACE_isCaptive', false]) ); + condition = QUOTE( !(ACE_player getVariable [ARR_2('ACE_isCaptive', false)]) ); }; class GVAR(isNotSurrendering) { - condition = QUOTE( !(_player getVariable ['ACE_isSurrender', false]) ); + condition = QUOTE( !(ACE_player getVariable [ARR_2('ACE_isSurrender', false)]) ); }; class GVAR(isNotSwimming) { - condition = QUOTE( !underwater _player ); + condition = QUOTE( !underwater ACE_player ); }; };