W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove vehicle actions when unconscious

Browse Source
This commit is contained in:
ebaydayz
2016-11-12 17:54:27 -05:00
parent 8b3376643d
commit abeb5f9383
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SQF/dayz_code/compile/fn_damageActions.sqf
View File

@@ -72,7 +72,7 @@ if (_inVehicle) then {
}; };
//Check if patients //Check if patients
_crew = crew _vehicle; _crew = crew _vehicle;
if (count _crew > 0) then { if (count _crew > 0 && !r_player_unconscious) then {
_unconscious_crew = []; _unconscious_crew = [];
{ {
if (_x getVariable "NORRN_unconscious") then { if (_x getVariable "NORRN_unconscious") then {
@@ -100,6 +100,13 @@ if (_inVehicle) then {
r_player_lastSeat = []; r_player_lastSeat = [];
}; };
if (r_player_unconscious) then {
call r_player_removeActions2;
r_player_lastVehicle = objNull;
r_player_lastSeat = [];
r_action_unload = false;
};
//Lets make sure the player is looking at the target //Lets make sure the player is looking at the target
if (isPlayer cursorTarget) then { if (isPlayer cursorTarget) then {
if (!r_drag_sqf && !r_action && !_inVehicle && !r_player_unconscious && (player distance _menClose < 3)) then { if (!r_drag_sqf && !r_action && !_inVehicle && !r_player_unconscious && (player distance _menClose < 3)) then {

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

@@ -124,7 +124,7 @@ if (!_canDoThis && s_player_Drinkfromhands >= 0) then {
if (_inVehicle) then { if (_inVehicle) then {
DZE_myVehicle = _vehicle; DZE_myVehicle = _vehicle;
if (_vehicleOwnerID != "0" && !(_vehicle isKindOf "Bicycle")) then { if (_vehicleOwnerID != "0" && !(_vehicle isKindOf "Bicycle") && _canDo) then {
if (s_player_lockUnlockInside_ctrl < 0) then { if (s_player_lockUnlockInside_ctrl < 0) then {
_totalKeys = call epoch_tempKeys; _totalKeys = call epoch_tempKeys;
_temp_keys = _totalKeys select 0; _temp_keys = _totalKeys select 0;

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

@@ -673,6 +673,7 @@ if (!isDedicated) then {
dayz_salvageInProgress = false; dayz_salvageInProgress = false;
lastSpawned = diag_tickTime; lastSpawned = diag_tickTime;
lastSepsis = 0; lastSepsis = 0;
NORRN_dropAction = -1;
//uiNamespace setVariable ['DAYZ_GUI_display',displayNull]; //uiNamespace setVariable ['DAYZ_GUI_display',displayNull];
//if (uiNamespace getVariable ['DZ_displayUI', 0] == 2) then { //if (uiNamespace getVariable ['DZ_displayUI', 0] == 2) then {
// dayzDebug = true; // dayzDebug = true;

5
SQF/dayz_code/medical/load/unLoad_act.sqf
View File

@@ -30,8 +30,9 @@ for [{ _loop = 0 },{ _loop < count _crewVcl },{ _loop = _loop + 1}] do
_unit switchMove ""; _unit switchMove "";
_unit switchMove "ainjppnemstpsnonwrfldnon"; _unit switchMove "ainjppnemstpsnonwrfldnon";
uiSleep 0.2; uiSleep 0.2;
// PVDZ_drg_Ralie = _unit; // not used //Needed or else patient user input is not fully disabled after eject
// publicVariable "PVDZ_drg_Ralie"; // not used PVDZ_drg_RaDrag = [_unit];
publicVariable "PVDZ_drg_RaDrag";
}; };
uiSleep 0.1; uiSleep 0.1;
}; };