From bc4c1787f9c25f8569045d988e43626525249ccd Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Thu, 13 Oct 2016 19:05:29 +0200
Subject: [PATCH] show tourniquets in 3d menu

---
 .../medical/ui/icons/medical_crossRed_t.paa   | Bin 0 -> 2897 bytes
 .../ui/icons/medical_crossYellow_t.paa        | Bin 0 -> 2897 bytes
 addons/medical/ui/icons/medical_cross_t.paa   | Bin 0 -> 2897 bytes
 .../functions/fnc_modifyAction.sqf            |  32 ++++++++++++++----
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 addons/medical/ui/icons/medical_crossRed_t.paa
 create mode 100644 addons/medical/ui/icons/medical_crossYellow_t.paa
 create mode 100644 addons/medical/ui/icons/medical_cross_t.paa

diff --git a/addons/medical/ui/icons/medical_crossRed_t.paa b/addons/medical/ui/icons/medical_crossRed_t.paa
new file mode 100644
index 0000000000000000000000000000000000000000..d024b5668952dfecd946fcdfb08556bd61d1f64b
GIT binary patch
literal 2897
zcmc&$F>ez|6n=Y~mC#Wv&B`TiBL2jo-N;hX+{u=*lej=~ksm-u#StV5QqfVTpfiQ5
z)LtVY6dDR*l=7-mWC`I&7>3Q_x$m3ZG0u`4%H2sflJ)t$dGGt)yqTR{&unb0rLB#v
zwG|QZygz@pc6aSJ+6II6#@eszw12{n_U8I}JHh{l_&vTR^5kcc=(@-+_+4!zl8Ar-
zgJM5GAM@IT%n=PxqD7RVRU!UO#j_rRKbRqJR^gBMP4@W@mf_-J<U!9*EPr6>bgI-$
zbW`{Hh$Aw78R<t}q*Tx5brQ;JGtFE*h0}4!fVwVZJIw1SH75Tg$3k3vu#FiE=r^X{
zuj6vu^Fdippwu?`P)1PcE$XOjTX!7#Eyks3sXIquj?W?W1{lOXMjc(8L(UJ`C-6p5
zSw}I=MvHk&m^hBvuPE?5#^?F`JKaV674^^O4Y6M$X(ve_E2bz4fDYZd)p+dUFGJRM
zmG#$osE0O``++{tZnd!AcHMbSG{fQ0V%1-4bGgqI4ld|B<KaFRSI;w($%JvXe&~)y
zI1lJYfI<Hpg9v%6@A&>JguK-+`9(Sy|GPf=&`DY?t~<x5){k>y`*|5&dj9_|56icF
zuK$5ID)-+HL!N{2Sf%yzQn$(fZ_nTMwu-1X%BEAG;PFFUd<g^*`OQ4f>$=YVr}~z6
z$a_O1NjfQY@%ZsxaQB~X`C$xGqYbHzH)ig19bQ$x;u(?`%XaI&=>C(qx~DpcU+#xe
z_PI1BpPbjneP++c_qZH~d-{2)t9b9~z{_mE3+OE3Fah(N9m8fk%CP$)USQvAGo`A&
zxO?A}&pTcO<vQU<UQc0v(Pv3IHV?A4&&#@(={vteu!!&K5!3^Il}Kp$`39y=^(I!H
zaD5tJ^|GaPIlekJrCEMmERMk*vf8AHA9Zc{vZbu7JT0+!u}VMVPJ!<Dz>asBx08OF
zp)Aei5{>Ws78wjXrXT+fqx~KbdBs=S?VZi8%X4MYM!Mf555}_J@thvMTxI_8(a{m(
z!=-qaS4YNWNW##!8jS`K>BsaVJ*>yqZN?!dV;<6P5xbi^ZTeB>x8q&%U06TjV&<*B
zJY*mDcCjGZvrp-c;~}CR+egfm{jBnO`_UouzM|2<#Xht_3{$J_Bg=2p7N@mQPc5p|
z7kusRog&Wl^M>58-;`ZBG4b8E(iQ#e-ENQgdf&`|C#LxFiuT#Zdk<Jvd1vCQhG!1`
z4>u1Eh!5_4Jmb6wA}k^T{)2;?AAl!s@5Y99Z};6Z;>_&7rvKHK!d$}_X%loA=+Exo
hAx_`lj)-^epM}Ke_WS9Itk_T2W6^IKjW<ZZ_zSL4LDT>M

literal 0
HcmV?d00001

diff --git a/addons/medical/ui/icons/medical_crossYellow_t.paa b/addons/medical/ui/icons/medical_crossYellow_t.paa
new file mode 100644
index 0000000000000000000000000000000000000000..7b7dd8562969fb40daee9c9d1a1478571dba034b
GIT binary patch
literal 2897
zcmc&$F>4e-6rOdnAX===a;4XZe?r*_2T7yc!tEp>2<Jbrvr;2i*aSOk3x7je*$9VV
zV__~>$yTNc*?@;gR>tppyYF&26GLL*z~$RF^WOKp_hvG?fnQ!;%zMi#iwnk>;M=#S
zVy`XUr|mIlFE8F(qJ0HF+JmK~zQyx%{9ax)=G8T0lIzCY!S7<j8fy#~Fer8ohQ^fM
z$BZcnu0(`$v>N17WdfPuL(5m3!#mY2et`ctkF?PXt?);rD}C<Vr1YHe_zQ&p3B&~b
z66b~zmsyGPRiXLRs-rlUpXkP+&B&8EHzt2kd9VJo(TKP~deJ_{S-&uDRwCzC>47w&
zR&Scev3}{(IPB3c&l}wu%*v-oy%>YY*m+bxMXsl9hDp-oQCG#bu8V$}resT^AfSI$
z)qm)!Ki4m!e=;sbv@v;Rt?1Tu%?e_z+l|NSe->U=U-_tqHZ=QzKG5#<Y}V9WRYWiS
z0Ji;|$GDwm4fLPKdH<<h6oux`$nEVQVswPTd9<S@LOwl>cV6eBHsnRW;WsA3_}}{M
zLuPwD)>~n;^}~|Bo`q+g|G&kdeBtByrEU~#H~Swp_IT`aJtt=&`7d++m5;ist1glK
zFRF@ri2aaigCI)C@9U~k|9QNuzVN2JH;l11%c+aw#-nL)Jpl245XLDHZOFwRnf$AM
z%OkufTkD?k9_ynIZ628oWq-!b$^WIt&8c}b^|$vvGN(O#AHbgV!#yqUtySl6?{dEj
z>G$lts`?s7Tk}8~!ft{{-fI)*+P;tt`-HZgL`Ii>=p6PDk2aGy$kH;iy0dyDQhOd5
z7g7kk*2IDi55kW(up-x8U{GJ_0isv@g;#aDrrUg7=rORHi0T{D-AiBOlD=7SB5Pg~
zyL<Kf1oPr|$n@ZkdD`g)*9ZAz!nUwnX-^o2g777#;@{mHCBtD8SN~#Me=u0nI8Bc>
z!X=(sv-8SxI2zp|^Ov2S9s0*J{<Il)8Wvo@%I!|4LqzzOR`0y)MfpHcdW7F*{%eCl
zpYa&e<K6O|nm_zf#@!l?&_}zufr4mHCiy^l+IX-^9fBG+93~^i{X(Nz3Fd)zvoF})
zbNLJKBOkXSb$a(2i239_Ub}Yl5PsUv8|DVTDU0=o2R?oDxmYj#+ue;J@#7mmk@@=P
z2iiy9A3tL{&7H|xn{lN-xVg1OeD?VJQIoEIrQkNh{MOdZ1M+-+lzQ63jor7ziGTBv
x^B;cJ{wlsmyGZgK=#QQ}AXfW#6XJs>M=>$EyI(Ds1%A4gUrYa~)A@t|jNf|Rk%RyM

literal 0
HcmV?d00001

diff --git a/addons/medical/ui/icons/medical_cross_t.paa b/addons/medical/ui/icons/medical_cross_t.paa
new file mode 100644
index 0000000000000000000000000000000000000000..0f7b6db14b9a23032a60529a5234d0238acac192
GIT binary patch
literal 2897
zcmc&$ONtvY5LF^COfsO^WbY&R01dJU*qekb5<)H$$S%8_N#N~(Z;&$xyvU|Od9O+(
zcelHfnGhI(yIj(%S09zs{h}O?`%iC=pZ6>0Tq)(N=wJ5lt1j!u{ksG8m-uo0<KggO
zhyUO3`@VMW$1CUFymqd`?`dP_cFwKc&tGtju_Sf1c#%N@Ef5U2(BV+#su%nbd?{&(
zcWJ)bMUlae_(7jJZ|vrz$@&Mlpty?6$sqk>{KBo^!IQ|7;MMG?mlA}35J~eq#QBDD
zQa^;T7zbHn@PaeHJ?4zhByj<Q5;%*qNyC{WF7kl^xbXKmwSAF=7-L-*o}Bv|zeB#K
z_#fMen-+KJd!~qdEbnVvW;d0Je|-LP_9%ny2kJmRU-vs>P%pI}3{>=qT<U+oX7P<D
zsXwb<O5^=QIiwzNAL-Zl{+EP%$#;qW`TW~{X#M|Ee%58N|7+bSTG@dYy{11nKeqqc
zPu!1bzf5%!+5XM#%M?G=X>a|O(oMb^XrJ@c&h&rvPdi*Nqq?!(hP>W~NEphXag=g%
zUvm8^`4f*3`M@y~UgSN?D<I%-J|)g;9C>tKX%@thbu5SZAW}K!<`>twobS1Nb!Zob
z6}<HVN7&-2z2BPWVs#ota&teZ+wv#B=6@;~iX;J9+a7YU|LglvudxK1Dc@AzxDCH9
zY?|&cr2O&v8kEUeh0-T0d}(befTGuyciPr+mvO=C@n+mqBOe&a*+$ma0L}&Hhh?G;
zbEyE#M{!0jV&E1RJG<WSHfeaS({4_tI&b`D4}Ek@mh3T~$ZPg^tB4(@T6>SyVKAw4
z<hsLopw#LipRBKGOi2lAI#xb`@)3giXZ41>76gt_B(53Od=a+r(y7_qyL*093Ot4r
zrB6|qQYhL^eU|x4-gaDvd%+`Ik>{}8a=zQ<3niMgmQmYbyA5Z~pY)O`Atu?TT!NJG
mgs+Y@zDPGp7cSi$;rXEx`n&F;blpQ<xfOuw)%!E@!uSoDBJT<S

literal 0
HcmV?d00001

diff --git a/addons/medical_menu/functions/fnc_modifyAction.sqf b/addons/medical_menu/functions/fnc_modifyAction.sqf
index f09d4560f5..88eae7f1de 100644
--- a/addons/medical_menu/functions/fnc_modifyAction.sqf
+++ b/addons/medical_menu/functions/fnc_modifyAction.sqf
@@ -18,21 +18,39 @@
 
 params ["_target", "_player", "_partIndex", "_actionData"];
 
-private _bloodLossOnSelection = 0;
+private _bloodLossOnBodyPart = 0;
 
 // Add all bleeding from wounds on selection
 {
     _x params ["", "", "_bodyPartN", "_amountOf", "_percentageOpen"];
 
     if (_bodyPartN == _partIndex) then {
-        _bloodLossOnSelection = _bloodLossOnSelection + (_amountOf * _percentageOpen);
+        _bloodLossOnBodyPart = _bloodLossOnBodyPart + (_amountOf * _percentageOpen);
     };
 } forEach (_target getvariable [QEGVAR(medical,openWounds), []]);
 
-if (_bloodLossOnSelection >= 0.15) then {
-    _actionData set [2, QPATHTOEF(medical,UI\icons\medical_crossRed.paa)];
-} else {
-    if (_bloodLossOnSelection > 0) then {
-        _actionData set [2, QPATHTOEF(medical,UI\icons\medical_crossYellow.paa)];
+private _hasTourniquet = ((_target getVariable [QEGVAR(medical,tourniquets), [0,0,0,0,0,0]]) select _partIndex) > 0;
+
+switch (true) do {
+    case (_bloodLossOnBodyPart >= 0.15): {
+        if (_hasTourniquet) then {
+            _actionData set [2, QPATHTOEF(medical,UI\icons\medical_crossRed_t.paa)];
+        } else {
+            _actionData set [2, QPATHTOEF(medical,UI\icons\medical_crossRed.paa)];
+        };
+    };
+
+    case (_bloodLossOnBodyPart > 0): {
+        if (_hasTourniquet) then {
+            _actionData set [2, QPATHTOEF(medical,UI\icons\medical_crossYellow_t.paa)];
+        } else {
+            _actionData set [2, QPATHTOEF(medical,UI\icons\medical_crossYellow.paa)];
+        };
+    };
+
+    default {
+        if (_hasTourniquet) then {
+            _actionData set [2, QPATHTOEF(medical,UI\icons\medical_cross_t.paa)];
+        };
     };
 };