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

Updated to use CBA's ARR_2 macro.

Browse Source
This commit is contained in:
Garth L-H de Wet 2015-01-12 22:20:42 +02:00
parent bfd9aedfa0
commit 57b766b48b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/explosives/CfgACE_Triggers.hpp
View File

@ -37,7 +37,7 @@ class CfgACE_Triggers {
class Timer { class Timer {
displayName = $STR_ACE_Explosives_timerName; displayName = $STR_ACE_Explosives_timerName;
picture = "ACE_Explosives\data\UI\Timer.paa"; picture = "ACE_Explosives\data\UI\Timer.paa";
onPlace = QUOTE( [_this select 1, (_this select 3) select 0] call FUNC(startTimer);false ); onPlace = QUOTE( [ARR_2(_this select 1, (_this select 3) select 0)] call FUNC(startTimer);false );
onSetup = QUOTE( _this call FUNC(openTimerSetUI);true ); onSetup = QUOTE( _this call FUNC(openTimerSetUI);true );
}; };
class Tripwire { class Tripwire {

4
addons/explosives/CfgVehicles.hpp
View File

@ -10,7 +10,7 @@ class CfgVehicles {
class ACE_SelfActions { class ACE_SelfActions {
class GVAR(Explosives) { class GVAR(Explosives) {
displayName = $STR_ACE_Explosives_Menu; displayName = $STR_ACE_Explosives_Menu;
condition = QUOTE( !(_player getVariable [QGVAR(PlantingExplosive), false]) ); condition = QUOTE( !(_player getVariable [ARR_2(QGVAR(PlantingExplosive), false)]) );
statement = ""; statement = "";
exceptions[] = {"ACE_Interaction_isNotSwimming"}; \ exceptions[] = {"ACE_Interaction_isNotSwimming"}; \
showDisabled = 1; showDisabled = 1;
@ -42,7 +42,7 @@ class CfgVehicles {
class ACE_Defuse { class ACE_Defuse {
displayName = $STR_ACE_Explosives_Defuse; displayName = $STR_ACE_Explosives_Defuse;
condition = QUOTE( [_player] call FUNC(canDefuse) ); condition = QUOTE( [_player] call FUNC(canDefuse) );
statement = QUOTE( [_player, EGVAR(Interaction, Target)] call FUNC(startDefuse); ); statement = QUOTE( [ARR_2(_player, EGVAR(Interaction, Target))] call FUNC(startDefuse); );
exceptions[] = {"ACE_Interaction_isNotSwimming"}; \ exceptions[] = {"ACE_Interaction_isNotSwimming"}; \
showDisabled = 0; showDisabled = 0;
icon = QUOTE( PATHTOF(UI\Defuse_ca.paa) ); icon = QUOTE( PATHTOF(UI\Defuse_ca.paa) );