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

Always remove fakeWeapon after adding

Browse Source 
Should fix #1500
This commit is contained in:
PabstMirror 2015-06-05 15:38:45 -05:00
parent 50b2dd0651
commit 4e8fc49b5e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/medical/functions/fnc_unconsciousPFH.sqf
View File

@ -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);

2
addons/respawn/functions/fnc_restoreGear.sqf
View File

@ -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;