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

Fix transfusion in vehicle

Browse Source
This commit is contained in:
icomrade
2016-09-27 12:46:13 -04:00
parent 8c3fe83a87
commit 58e90da07d
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/compile/keyboard.sqf
View File

@@ -175,7 +175,9 @@ if (isNil "keyboard_keys") then {
force_dropBody = true; force_dropBody = true;
}; };
_interrupt = { _interrupt = {
r_interrupt = true; if (vehicle player == player) then { //allow med actions in moving vehicles
r_interrupt = true;
};
if (DZE_Surrender) then {call dze_surrender_off}; if (DZE_Surrender) then {call dze_surrender_off};
if (autoRunActive) then {call autoRunOff;}; if (autoRunActive) then {call autoRunOff;};
}; };

25
SQF/dayz_code/medical/selfbloodbag.sqf
View File

@@ -1,4 +1,4 @@
private ["_unit","_blood","_lowBlood","_injured","_inPain","_lastused","_animState","_started","_finished","_timer","_i","_isMedic","_isClose","_duration","_rhVal","_bloodBagArrayNeeded","_BBneeded","_bbselect","_bloodBagNeeded","_badBag","_wholeBag","_bagFound","_bagToRemove","_forceClose","_bloodType","_rh","_bloodBagArray","_bbarray_length","_bloodBagWholeNeeded","_haswholebag","_r","_transfusionInfection"]; private ["_unit","_blood","_lowBlood","_injured","_inPain","_lastused","_animState","_started","_finished","_timer","_i","_isMedic","_duration","_rhVal","_bloodBagArrayNeeded","_BBneeded","_bbselect","_bloodBagNeeded","_badBag","_wholeBag","_bagFound","_bagToRemove","_forceClose","_bloodType","_rh","_bloodBagArray","_bbarray_length","_bloodBagWholeNeeded","_haswholebag","_r","_transfusionInfection"];
// bleed.sqf // bleed.sqf
_unit = _this select 0; _unit = _this select 0;
@@ -69,7 +69,7 @@ while {r_doLoop and (_i < 12)} do {
_animState = animationState player; _animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString; _isMedic = ["medic",_animState] call fnc_inString;
if (_isMedic and !_started) then { if (((vehicle player != player) || _isMedic) and !_started) then {
closeDialog 0; closeDialog 0;
diag_log format ["TRANSFUSION: starting blood transfusion (%1 > %2)", name player, name _unit]; diag_log format ["TRANSFUSION: starting blood transfusion (%1 > %2)", name player, name _unit];
if (_badBag) then { if (_badBag) then {
@@ -115,9 +115,12 @@ while {r_doLoop and (_i < 12)} do {
}; };
}; };
}; };
if (vehicle player == player) then {
if (!_isMedic) then { if (!_isMedic) then {
player playActionNow "Medic"; player playActionNow "Medic";
};
} else {
uisleep 4;
}; };
}; };
@@ -131,10 +134,8 @@ while {r_doLoop and (_i < 12)} do {
r_doLoop = false; r_doLoop = false;
}; };
_isClose = ((player distance _unit) < ((sizeOf typeOf _unit) / 2)); if (r_interrupt or _forceClose) then {
diag_log format ["TRANSFUSION: transfusion was interrupted (r_interrupt: %1 | distance: %2 | _i = %3)", r_interrupt, player distance _unit, _i];
if (r_interrupt or !_isClose or _forceClose) then {
diag_log format ["TRANSFUSION: transfusion was interrupted (r_interrupt: %1 | distance: %2 (%3) | _i = %4)", r_interrupt, player distance _unit, _isClose, _i];
localize "str_actions_medical_transfusion_interrupted" call dayz_rollingMessages; localize "str_actions_medical_transfusion_interrupted" call dayz_rollingMessages;
r_doLoop = false; r_doLoop = false;
}; };
@@ -146,6 +147,8 @@ r_doLoop = false;
if (r_interrupt) then { if (r_interrupt) then {
r_interrupt = false; r_interrupt = false;
player switchMove ""; if (vehicle player == player) then {
player playActionNow "stop"; player switchMove "";
player playActionNow "stop";
};
}; };