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

Move _hit == "" exitWith further down in damage handler

Browse Source 
Vanilla development commit:

837a2623b0
This commit is contained in:
ebaydayz
2016-08-13 20:22:57 -04:00
parent 9d6c17d706
commit c75ccbb8b3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SQF/dayz_code/compile/fn_damageHandler.sqf
View File

@@ -20,9 +20,6 @@ _isHeadHit = (_hit == "head_hit");
_isPlayer = (isPlayer _source); _isPlayer = (isPlayer _source);
_isZombieHit = _ammo == "zombie"; _isZombieHit = _ammo == "zombie";
//Ignore none part dmg.
if (_hit == "") exitwith { 0 };
_falling = (((_hit == "legs") AND {(_source==_unit)}) AND {((_ammo=="") AND {(Dayz_freefall select 1 > 3)})}); _falling = (((_hit == "legs") AND {(_source==_unit)}) AND {((_ammo=="") AND {(Dayz_freefall select 1 > 3)})});
//Simple hack to help with a few issues from direct damage to physic based damage. ***until 2.0*** //Simple hack to help with a few issues from direct damage to physic based damage. ***until 2.0***
@@ -48,7 +45,7 @@ _falling = (((_hit == "legs") AND {(_source==_unit)}) AND {((_ammo=="") AND {(Da
if (_ammo == "") exitwith { _end = true; }; if (_ammo == "") exitwith { _end = true; };
//If _source contains no object exit. But lets not exit if the unit returns player. Maybe its his own fault. //If _source contains no object exit. But lets not exit if the unit returns player. Maybe its his own fault.
if (isNull _source) exitwith { _end = true; }; if (isNull _source) then { _end = true; };
}; };
@@ -61,7 +58,7 @@ if (_unit == player) then {
_unit setVariable["startcombattimer", 1]; _unit setVariable["startcombattimer", 1];
_unit setVariable["inCombat", 1, true]; _unit setVariable["inCombat", 1, true];
if (_hit == "") then if (_hit == "") exitWith //Ignore none part dmg. Exit after processing humanity hit
{ {
if ((_source != player) and _isPlayer && alive player) then if ((_source != player) and _isPlayer && alive player) then
{ {
@@ -181,6 +178,9 @@ if (_unit == player) then {
if (dayz_lastDamageSource != "none") then {dayz_lastDamageTime = diag_tickTime;}; if (dayz_lastDamageSource != "none") then {dayz_lastDamageTime = diag_tickTime;};
}; };
//Ignore none part dmg. Exit after processing humanity hit
if (_hit == "") exitWith { 0 };
//Pure base blood damage //Pure base blood damage
_scale = 200; _scale = 200;