From e00f0ea4c3503860b3a12b48609472be4f5a569b Mon Sep 17 00:00:00 2001
From: Glowbal <thomasskooi@live.nl>
Date: Sat, 11 Apr 2015 22:47:10 +0200
Subject: [PATCH] No longer creates a new waitAndExec for every handleDamage
 call

---
 .../functions/fnc_handleDamage_basic.sqf      | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf
index 96e3214b0e..aa9c2f61df 100644
--- a/addons/medical/functions/fnc_handleDamage_basic.sqf
+++ b/addons/medical/functions/fnc_handleDamage_basic.sqf
@@ -42,6 +42,20 @@ if (diag_frameno > (_unit getVariable [QGVAR(frameNo), -3]) + 2) then {
     _unit setVariable [QGVAR(damages), []];
     _unit setVariable [QGVAR(structDamage), 0];
     _unit setVariable [QGVAR(preventDeath), false];
+    // Assign orphan structural damage to torso
+    [{
+        private ["_unit", "_damagesum"];
+        _unit = _this select 0;
+        _damagesum = (_unit getHitPointDamage "HitHead") +
+            (_unit getHitPointDamage "HitBody") +
+            (_unit getHitPointDamage "HitLeftArm") +
+            (_unit getHitPointDamage "HitRightArm") +
+            (_unit getHitPointDamage "HitLeftLeg") +
+            (_unit getHitPointDamage "HitRightLeg");
+        if (_damagesum < 0.06 and damage _unit > 0.06 and alive _unit) then {
+            _unit setHitPointDamage ["HitBody", damage _unit];
+        };
+    }, [_unit], 2, 0.1] call EFUNC(common,waitAndExecute);
 };
 
 _newDamage = _damage - (damage _unit);
@@ -105,30 +119,12 @@ if (_selectionName == "") then {
     };
 };
 
-
-// Assign orphan structural damage to torso
-[{
-    private ["_unit", "_damagesum"];
-    _unit = _this select 0;
-    _damagesum = (_unit getHitPointDamage "HitHead") +
-        (_unit getHitPointDamage "HitBody") +
-        (_unit getHitPointDamage "HitLeftArm") +
-        (_unit getHitPointDamage "HitRightArm") +
-        (_unit getHitPointDamage "HitLeftLeg") +
-        (_unit getHitPointDamage "HitRightLeg");
-    if (_damagesum < 0.06 and damage _unit > 0.06 and alive _unit) then {
-        _unit setHitPointDamage ["HitBody", damage _unit];
-    };
-}, [_unit], 2, 0.1] call EFUNC(common,waitAndExecute);
-
-
 if (_selectionName == "") then {
     _damage = _damage + (_unit getVariable QGVAR(structDamage));
 } else {
     _damage = _damage + _newDamage;
 };
 
-
 // Leg Damage
 _legdamage = (_unit getHitPointDamage "HitLeftLeg") + (_unit getHitPointDamage "HitRightLeg");
 if (_selectionName == "leg_l") then {
@@ -139,9 +135,9 @@ if (_selectionName == "leg_r") then {
 };
 
 if (_legdamage >= LEGDAMAGETRESHOLD1) then {
-    if (_unit getHitPointDamage "HitLegs" != 1) then {_unit setHitPointDamage ["HitLegs", 1]};
+    _unit setHitPointDamage ["HitLegs", 1];
 } else {
-    if (_unit getHitPointDamage "HitLegs" != 0) then {_unit setHitPointDamage ["HitLegs", 0]};
+    _unit setHitPointDamage ["HitLegs", 0];
 };
 // @todo: force prone for completely fucked up legs.
 
@@ -156,9 +152,9 @@ if (_selectionName == "hand_r") then {
 };
 
 if (_armdamage >= ARMDAMAGETRESHOLD1) then {
-    if (_unit getHitPointDamage "HitHands" != 1) then {_unit setHitPointDamage ["HitHands", 1]};
+    _unit setHitPointDamage ["HitHands", 1];
 } else {
-    if (_unit getHitPointDamage "HitHands" != 0) then {_unit setHitPointDamage ["HitHands", 0]};
+    _unit setHitPointDamage ["HitHands", 0];
 };
 // @todo: Drop weapon for full damage.
 
@@ -170,7 +166,6 @@ if (_selectionName == "") then {
     _unit setVariable [QGVAR(pain), _pain min 1, true];
 };
 
-
 // Unconsciousness
 if (_selectionName == "" and
     _damage >= UNCONSCIOUSNESSTRESHOLD and