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

Merge pull request #972 from icomrade/master

Browse Source 
Fix medical actions in vehicles
This commit is contained in:
vbawol
2014-01-08 22:07:40 -08:00
parent 37fe2e26ca 84ebc488ab
commit 891b9dce48
8 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SQF/dayz_code/medical/bandage.sqf
View File

@@ -35,6 +35,11 @@ while {r_doLoop} do {
if (r_interrupt) then {
r_doLoop = false;
};
if (vehicle player != player) then {
sleep 3;
r_doLoop = false;
_finished = true;
};
sleep 0.1;
};
r_doLoop = false;
@@ -53,7 +58,7 @@ if (_finished) then {
usecBandage = [_unit,player];
publicVariable "usecBandage";
if (_unit == player) then {
if ((_unit == player) or (vehicle player != player)) then {
//Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medBandaged.sqf";
dayz_sourceBleeding = objNull;

7
SQF/dayz_code/medical/morphine.sqf
View File

@@ -34,6 +34,11 @@ while {r_doLoop} do {
if (r_interrupt) then {
r_doLoop = false;
};
if (vehicle player != player) then {
sleep 3;
r_doLoop = false;
_finished = true;
};
sleep 0.1;
};
r_doLoop = false;
@@ -47,7 +52,7 @@ if (_finished) then {
_display closeDisplay 0;
};
if (_unit == player) then {
if ((_unit == player) or (vehicle player != player)) then {
//Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf";
} else {

2
SQF/dayz_code/medical/painkiller.sqf
View File

@@ -24,7 +24,7 @@ if(_num_removed == 1) then {
player playActionNow "Gear";
};
if (_unit == player) then {
if ((_unit == player) or (vehicle player != player)) then {
//Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medPainkiller.sqf";
} else {

2
SQF/dayz_code/medical/publicEH/animHealed.sqf
View File

@@ -4,7 +4,7 @@ private ["_unit"];
_unit = _this select 0;
_unit switchMove "AmovPpneMstpSnonWnonDnon_healed";
if (_unit == player) then {
if ((_unit == player) or (vehicle player != player)) then {
r_player_unconscious = false;
r_player_injured = false;
};

2
SQF/dayz_code/medical/publicEH/medBandaged.sqf
View File

@@ -5,7 +5,7 @@ _array = _this; //_this select 0;
_unit = _array select 0;
_medic = _array select 1;
if (_unit == player) then {
if ((_unit == player) or (vehicle player != player)) then {
r_player_injured = false;
"dynamicBlur" ppEffectAdjust [0]; "dynamicBlur" ppEffectCommit 5;
r_player_handler = false;

2
SQF/dayz_code/medical/publicEH/medMorphine.sqf
View File

@@ -5,7 +5,7 @@ _array = _this; //_this select 0;
_unit = _array select 0;
_medic = _array select 1;
if (_unit == player) then {
if ((_unit == player) or (vehicle player != player)) then {
r_fracture_legs = false;
r_fracture_arms = false;
_unit setHit["legs",0];

2
SQF/dayz_code/medical/publicEH/medPainkiller.sqf
View File

@@ -5,7 +5,7 @@ _array = _this; //_this select 0;
_unit = _array select 0;
_medic = _array select 1;
if (_unit == player) then {
if ((_unit == player) or (vehicle player != player)) then {
r_player_inpain = false;
R3F_TIRED_Accumulator = 0;
"dynamicBlur" ppEffectAdjust [0]; "dynamicBlur" ppEffectCommit 5;

2
SQF/dayz_code/medical/setup_functions_med.sqf
View File

@@ -39,7 +39,7 @@ fnc_usec_damageUnconscious = {
_unit = _this select 0;
_damage = _this select 1;
_inVehicle = (vehicle _unit != _unit);
if (_unit == player) then {
if ((_unit == player) or (vehicle player != player)) then {
r_player_timeout = round((((random 2) max 0.1) * _damage) * 20);
r_player_unconscious = true;
player setVariable["medForceUpdate",true,true];