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

Move RemoveHandcuffs to Main (always blocked by hands)

Browse Source
This commit is contained in:
PabstMirror 2015-08-23 23:41:35 -05:00
parent 8ca06a9a76
commit 40634318f0
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/captives/CfgVehicles.hpp
View File

@ -12,6 +12,8 @@ class CfgVehicles {
exceptions[] = {}; exceptions[] = {};
icon = QUOTE(PATHTOF(UI\handcuff_ca.paa)); icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
}; };
class ACE_MainActions {
class ACE_RemoveHandcuffs { class ACE_RemoveHandcuffs {
displayName = CSTRING(ReleaseCaptive); displayName = CSTRING(ReleaseCaptive);
selection = "righthand"; selection = "righthand";
@ -21,8 +23,6 @@ class CfgVehicles {
exceptions[] = {}; exceptions[] = {};
icon = QUOTE(PATHTOF(UI\handcuff_ca.paa)); icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
}; };
class ACE_MainActions {
class ACE_EscortCaptive { class ACE_EscortCaptive {
displayName = CSTRING(EscortCaptive); displayName = CSTRING(EscortCaptive);
distance = 4; distance = 4;
@ -97,7 +97,7 @@ class CfgVehicles {
}; };
}; };
#define MACRO_LOADUNLOADCAPTIVE \ #define MACRO_LOADCAPTIVE \
class ACE_Actions { \ class ACE_Actions { \
class ACE_MainActions { \ class ACE_MainActions { \
class GVAR(LoadCaptive) { \ class GVAR(LoadCaptive) { \
@ -113,27 +113,27 @@ class CfgVehicles {
class LandVehicle; class LandVehicle;
class Car: LandVehicle { class Car: LandVehicle {
MACRO_LOADUNLOADCAPTIVE MACRO_LOADCAPTIVE
}; };
class Tank: LandVehicle { class Tank: LandVehicle {
MACRO_LOADUNLOADCAPTIVE MACRO_LOADCAPTIVE
}; };
class Air; class Air;
class Helicopter: Air { class Helicopter: Air {
MACRO_LOADUNLOADCAPTIVE MACRO_LOADCAPTIVE
}; };
class Plane: Air { class Plane: Air {
MACRO_LOADUNLOADCAPTIVE MACRO_LOADCAPTIVE
}; };
class Ship; class Ship;
class Ship_F: Ship { class Ship_F: Ship {
MACRO_LOADUNLOADCAPTIVE MACRO_LOADCAPTIVE
}; };
class StaticWeapon: LandVehicle { class StaticWeapon: LandVehicle {
MACRO_LOADUNLOADCAPTIVE MACRO_LOADCAPTIVE
}; };
class Box_NATO_Support_F; class Box_NATO_Support_F;

3
addons/captives/functions/fnc_canRemoveHandcuffs.sqf
View File

@ -20,4 +20,5 @@ params ["_unit", "_target"];
//Unit is handcuffed and not currently being escorted //Unit is handcuffed and not currently being escorted
_target getVariable [QGVAR(isHandcuffed), false] && _target getVariable [QGVAR(isHandcuffed), false] &&
{isNull (attachedTo _target)} {isNull (attachedTo _target)} &&
{(vehicle _target) == _target}