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

interaction: fix canInteract and exceptions in agm menu

Browse Source
This commit is contained in:
Nicolás Badano 2015-01-20 02:39:22 -03:00
parent f3746d8391
commit 9e11aeb0b9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/scripts/KeyInput/initCanInteractFunction.sqf
View File

@ -5,7 +5,7 @@ private ["_function", "_configFile", "_count", "_index", "_config", "_configName
_function = "private '_exceptions'; _exceptions = _this; alive ACE_player"; _function = "private '_exceptions'; _exceptions = _this; alive ACE_player";
_configFile = configFile >> QGVAR(canInteractConditions); _configFile = configFile >> "ACE_canInteractConditions";
_count = count _configFile; _count = count _configFile;
for "_index" from 0 to (_count -1) do { for "_index" from 0 to (_count -1) do {

8
addons/interaction/config.cpp
View File

@ -98,15 +98,15 @@ class ACE_Parameters_Boolean {
class ACE_canInteractConditions { class ACE_canInteractConditions {
class GVAR(isNotEscorting) { class GVAR(isNotEscorting) {
condition = QUOTE( !(_player getVariable ['ACE_isEscorting', false]) ); condition = QUOTE( !(ACE_player getVariable [ARR_2('ACE_isEscorting', false)]) );
}; };
class GVAR(isNotCaptive) { class GVAR(isNotCaptive) {
condition = QUOTE( !(_player getVariable ['ACE_isCaptive', false]) ); condition = QUOTE( !(ACE_player getVariable [ARR_2('ACE_isCaptive', false)]) );
}; };
class GVAR(isNotSurrendering) { class GVAR(isNotSurrendering) {
condition = QUOTE( !(_player getVariable ['ACE_isSurrender', false]) ); condition = QUOTE( !(ACE_player getVariable [ARR_2('ACE_isSurrender', false)]) );
}; };
class GVAR(isNotSwimming) { class GVAR(isNotSwimming) {
condition = QUOTE( !underwater _player ); condition = QUOTE( !underwater ACE_player );
}; };
}; };