W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1976 from oiad/patch-7

Browse Source 
Only allow lock removal if door is unlocked
This commit is contained in:
icomrade
2017-09-08 10:05:28 -04:00
committed by GitHub
parent 7a3c831eb3 b8dba25cc5
commit 26da25bf42
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQF/dayz_code/compile/fn_selfActions.sqf
View File

@@ -13,7 +13,7 @@ private ["_canPickLight","_text","_unlock","_lock","_totalKeys","_temp_keys","_t
"_isModular","_isModularDoor","_isHouse","_isGateOperational","_isGateLockable","_isFence","_isLockableGate","_isUnlocked","_isOpen","_isClosed","_ownerArray","_ownerBuildLock", "_isModular","_isModularDoor","_isHouse","_isGateOperational","_isGateLockable","_isFence","_isLockableGate","_isUnlocked","_isOpen","_isClosed","_ownerArray","_ownerBuildLock",
"_ownerPID","_speed","_dog","_vehicle","_inVehicle","_cursorTarget","_primaryWeapon","_currentWeapon","_magazinesPlayer","_onLadder","_canDo", "_ownerPID","_speed","_dog","_vehicle","_inVehicle","_cursorTarget","_primaryWeapon","_currentWeapon","_magazinesPlayer","_onLadder","_canDo",
"_nearLight","_vehicleOwnerID","_hasHotwireKit","_isPZombie","_dogHandle","_allowedDistance","_id","_upgrade","_weaponsPlayer","_hasCrowbar", "_nearLight","_vehicleOwnerID","_hasHotwireKit","_isPZombie","_dogHandle","_allowedDistance","_id","_upgrade","_weaponsPlayer","_hasCrowbar",
"_allowed","_hasAccess","_uid","_myCharID","_isLocked"]; "_allowed","_hasAccess","_uid","_myCharID","_isLocked","_isDoorUnlocked"];
_vehicle = vehicle player; _vehicle = vehicle player;
_inVehicle = (_vehicle != player); _inVehicle = (_vehicle != player);
@@ -846,7 +846,8 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
s_player_downgrade_build = -1; s_player_downgrade_build = -1;
}; };
}; };
if (s_player_downgrade_build < 0) then { _isDoorUnlocked = (((_cursorTarget animationPhase "Open_door" == 0) && (_cursorTarget animationPhase "Open_hinge" == 1)) || ((_cursorTarget animationPhase "Open_door" == 0) && (_cursorTarget animationPhase "Open_latch" == 1)));
if (s_player_downgrade_build < 0 && _isDoorUnlocked) then {
_hasAccess = [player, _cursorTarget] call FNC_check_access; _hasAccess = [player, _cursorTarget] call FNC_check_access;
if ((_hasAccess select 0) or (_hasAccess select 2) or (_hasAccess select 3)) then { if ((_hasAccess select 0) or (_hasAccess select 2) or (_hasAccess select 3)) then {
s_player_lastTarget set [1,_cursorTarget]; s_player_lastTarget set [1,_cursorTarget];