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

Fix needing to click lock/unlock twice from inside vehicle to take effect

Browse Source 
No reason to use spawn here. Spawn can have a delay. Since
fn_selfActions runs faster it can register the vehicle as still locked
or unlocked after you clicked the action.
This commit is contained in:
ebaydayz
2016-08-05 14:38:12 -04:00
parent c51fd11511
commit 7a4775beea
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/actions/hotwire_veh.sqf
View File

@@ -7,7 +7,7 @@ DZE_ActionInProgress = true;
{player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = [];
s_player_lockUnlock_crtl = 1; s_player_lockUnlock_crtl = 1;
{DZE_myVehicle removeAction _x} count s_player_lockUnlockInside;s_player_lockUnlockInside = []; {DZE_myVehicle removeAction _x} count s_player_lockUnlockInside;s_player_lockUnlockInside = [];
s_player_lockUnlockInside_ctrl = -1; s_player_lockUnlockInside_ctrl = 1;
_removed = ([player,"ItemHotwireKit",1] call BIS_fnc_invRemove); _removed = ([player,"ItemHotwireKit",1] call BIS_fnc_invRemove);
@@ -19,7 +19,7 @@ if (_removed == 1) then {
if(player distance _vehicle < 10) then { if(player distance _vehicle < 10) then {
if (local _vehicle) then { if (local _vehicle) then {
PVDZE_veh_Lock spawn local_lockUnlock PVDZE_veh_Lock call local_lockUnlock
} else { } else {
publicVariable "PVDZE_veh_Lock"; publicVariable "PVDZE_veh_Lock";
}; };

4
SQF/dayz_code/actions/lock_veh.sqf
View File

@@ -7,12 +7,12 @@ DZE_ActionInProgress = true;
{player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = [];
s_player_lockUnlock_crtl = 1; s_player_lockUnlock_crtl = 1;
{DZE_myVehicle removeAction _x} count s_player_lockUnlockInside;s_player_lockUnlockInside = []; {DZE_myVehicle removeAction _x} count s_player_lockUnlockInside;s_player_lockUnlockInside = [];
s_player_lockUnlockInside_ctrl = -1; s_player_lockUnlockInside_ctrl = 1;
PVDZE_veh_Lock = [_vehicle,true]; PVDZE_veh_Lock = [_vehicle,true];
if(player distance _vehicle < 10) then { if(player distance _vehicle < 10) then {
if (local _vehicle) then { if (local _vehicle) then {
PVDZE_veh_Lock spawn local_lockUnlock PVDZE_veh_Lock call local_lockUnlock
} else { } else {
publicVariable "PVDZE_veh_Lock"; publicVariable "PVDZE_veh_Lock";
}; };

4
SQF/dayz_code/actions/unlock_veh.sqf
View File

@@ -8,12 +8,12 @@ DZE_ActionInProgress = true;
{player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = [];
s_player_lockUnlock_crtl = 1; s_player_lockUnlock_crtl = 1;
{DZE_myVehicle removeAction _x} count s_player_lockUnlockInside;s_player_lockUnlockInside = []; {DZE_myVehicle removeAction _x} count s_player_lockUnlockInside;s_player_lockUnlockInside = [];
s_player_lockUnlockInside_ctrl = -1; s_player_lockUnlockInside_ctrl = 1;
PVDZE_veh_Lock = [_vehicle,false]; PVDZE_veh_Lock = [_vehicle,false];
if(player distance _vehicle < 10) then { if(player distance _vehicle < 10) then {
if (local _vehicle) then { if (local _vehicle) then {
PVDZE_veh_Lock spawn local_lockUnlock PVDZE_veh_Lock call local_lockUnlock
} else { } else {
publicVariable "PVDZE_veh_Lock"; publicVariable "PVDZE_veh_Lock";
}; };

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

@@ -150,13 +150,10 @@ if (_inVehicle) then {
s_player_lockUnlockInside_ctrl = -1; s_player_lockUnlockInside_ctrl = -1;
}; };
} else { } else {
if (!isNil "DZE_myVehicle") then { {DZE_myVehicle removeAction _x} count s_player_lockUnlockInside;s_player_lockUnlockInside = [];
{DZE_myVehicle removeAction _x} count s_player_lockUnlockInside;s_player_lockUnlockInside = []; s_player_lockUnlockInside_ctrl = -1;
s_player_lockUnlockInside_ctrl = -1;
};
}; };
if (DZE_HeliLift) then { if (DZE_HeliLift) then {
_hasAttached = _vehicle getVariable["hasAttached",false]; _hasAttached = _vehicle getVariable["hasAttached",false];
if (_inVehicle && {_vehicle isKindOf "Air"} && {(([_vehicle] call FNC_getPos) select 2) < 30} && {speed _vehicle < 5} && {typeName _hasAttached == "OBJECT"}) then { if (_inVehicle && {_vehicle isKindOf "Air"} && {(([_vehicle] call FNC_getPos) select 2) < 30} && {speed _vehicle < 5} && {typeName _hasAttached == "OBJECT"}) then {

2
SQF/dayz_code/init/publicEH.sqf
View File

@@ -12,7 +12,7 @@
//"dayzInfectedCamps" addPublicVariableEventHandler {(_this select 1) call infectedcamps}; //"dayzInfectedCamps" addPublicVariableEventHandler {(_this select 1) call infectedcamps};
// EPOCH ADDITIONS // EPOCH ADDITIONS
"PVDZE_veh_Lock" addPublicVariableEventHandler {(_this select 1) spawn local_lockUnlock}; "PVDZE_veh_Lock" addPublicVariableEventHandler {(_this select 1) call local_lockUnlock};
"PVDZE_plr_GutBodyZ" addPublicVariableEventHandler {(_this select 1) spawn local_gutObjectZ}; "PVDZE_plr_GutBodyZ" addPublicVariableEventHandler {(_this select 1) spawn local_gutObjectZ};
"PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH}; "PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH};

1
SQF/dayz_code/init/variables.sqf
View File

@@ -687,4 +687,5 @@ if (!isDedicated) then {
DZE_Surrender = false; DZE_Surrender = false;
DZE_Quarantine = false; DZE_Quarantine = false;
DZE_InRadiationZone = false; DZE_InRadiationZone = false;
DZE_myVehicle = objNull;
}; };