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 errors on game start

Browse Source
This commit is contained in:
commy2 2015-09-28 17:28:51 +02:00
parent 5c5a65443b
commit 9bf7b68d76
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/interaction/CfgVehicles.hpp
View File

@ -116,9 +116,8 @@ class CfgVehicles {
}; };
class ACE_Pardon { class ACE_Pardon {
displayName = CSTRING(Pardon); displayName = CSTRING(Pardon);
condition = QUOTE(rating _target < -2000 && {alive _target} && {side group _player == side group _target});
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canPardon)); condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canPardon));
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(pardon)); statement = QUOTE([ARR_2(_player,_target)] call DFUNC(pardon));
showDisabled = 0; showDisabled = 0;
priority = 2.5; priority = 2.5;
}; };

2
addons/interaction/XEH_preInit.sqf
View File

@ -3,7 +3,7 @@
ADDON = false; ADDON = false;
// interaction menu // interaction menu
PREP(addPassengerActions) PREP(addPassengerActions);
PREP(addPassengersActions); PREP(addPassengersActions);
PREP(getWeaponPos); PREP(getWeaponPos);
PREP(moduleInteraction); PREP(moduleInteraction);