mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
parent
50b2dd0651
commit
4e8fc49b5e
@ -30,6 +30,10 @@ _hasMovedOut = _args select 4;
|
|||||||
_parachuteCheck = _args select 5;
|
_parachuteCheck = _args select 5;
|
||||||
|
|
||||||
if (!alive _unit) exitwith {
|
if (!alive _unit) exitwith {
|
||||||
|
if ("ACE_FakePrimaryWeapon" in (weapons _unit)) then {
|
||||||
|
TRACE_1("Removing fake weapon [on death]",_unit);
|
||||||
|
_unit removeWeapon "ACE_FakePrimaryWeapon";
|
||||||
|
};
|
||||||
if (GVAR(moveUnitsFromGroupOnUnconscious)) then {
|
if (GVAR(moveUnitsFromGroupOnUnconscious)) then {
|
||||||
[_unit, false, "ACE_isUnconscious", side group _unit] call EFUNC(common,switchToGroupSide);
|
[_unit, false, "ACE_isUnconscious", side group _unit] call EFUNC(common,switchToGroupSide);
|
||||||
};
|
};
|
||||||
@ -49,6 +53,11 @@ if !(_unit getvariable ["ACE_isUnconscious",false]) exitwith {
|
|||||||
// TODO, handle this with carry instead, so we can remove the PFH here.
|
// TODO, handle this with carry instead, so we can remove the PFH here.
|
||||||
// Wait until the unit isn't being carried anymore, so we won't end up with wierd animations
|
// Wait until the unit isn't being carried anymore, so we won't end up with wierd animations
|
||||||
if !(([_unit] call FUNC(isBeingCarried)) || ([_unit] call FUNC(isBeingDragged))) then {
|
if !(([_unit] call FUNC(isBeingCarried)) || ([_unit] call FUNC(isBeingDragged))) then {
|
||||||
|
if ("ACE_FakePrimaryWeapon" in (weapons _unit)) then {
|
||||||
|
TRACE_1("Removing fake weapon [on wakeup]",_unit);
|
||||||
|
_unit removeWeapon "ACE_FakePrimaryWeapon";
|
||||||
|
};
|
||||||
|
|
||||||
if (vehicle _unit == _unit) then {
|
if (vehicle _unit == _unit) then {
|
||||||
if (animationState _unit == "AinjPpneMstpSnonWrflDnon") then {
|
if (animationState _unit == "AinjPpneMstpSnonWrflDnon") then {
|
||||||
[_unit,"AinjPpneMstpSnonWrflDnon_rolltofront", 2] call EFUNC(common,doAnimation);
|
[_unit,"AinjPpneMstpSnonWrflDnon_rolltofront", 2] call EFUNC(common,doAnimation);
|
||||||
|
@ -98,7 +98,7 @@ if(format["%1", _backpack] != "") then {
|
|||||||
|
|
||||||
|
|
||||||
// primaryWeapon
|
// primaryWeapon
|
||||||
if (_primaryweapon != "") then {
|
if ((_primaryweapon != "") && {_primaryweapon != "ACE_FakePrimaryWeapon"}) then {
|
||||||
{
|
{
|
||||||
_unit addMagazine _x;
|
_unit addMagazine _x;
|
||||||
} forEach _primaryweaponmagazine;
|
} forEach _primaryweaponmagazine;
|
||||||
|
Loading…
Reference in New Issue
Block a user