From a5599e1942fb99e4d7b54dcc402ea9c672e40b30 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Mon, 10 Apr 2017 00:57:17 +0800
Subject: [PATCH] Simplified ToggleHighlightObject in gl_highlighting.

---
 artifacts/mods/gl_highlighting.int | Bin 3648 -> 3470 bytes
 artifacts/mods/gl_highlighting.ssl |  17 ++++-------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int
index 3edec4709134ad1940818e427732534f59e027ca..119c9f97ad5cf654fda1c16d4ccd3c74bf0abbb8 100644
GIT binary patch
delta 541
zcmX>g(<eRQf)V>M1_lO31_nkY1{A>g0m5Z8fzU9Ld(CDh#vEoQ?lqeWSj?H6*BxL4
zNi`TXNP}4H91Ri;`VCSbHUndWQG+W)ob6GAM1w0_hOI#eCd1A#`2m}%AjBM&1|f)g
zc8kek?DC9Blg-#Q8K+H7VAo_^H@S;lZgL7o0~5!+$<H`^WH|Q0Y?%OZ!@Z`m29pMT
zkQm3F$$p&noF)w{ARgzr$<sLPm^jZ(zQ*Yz!wIno<hI`+Sq8=iV~8%!HIwbQ>={)i
z*KvjEa8H3s8i8r%1|gU-?lQ0lLxT}S8+X7YZbd;mupkp$P-3zXw<aUo<QQ%%Cayn|
zFL29B3qYL1z||nsumhx=+YBPYZ333}fbbYN;qrM95$+t2Jm(ZBZ_;Ev9y1=^vc?oh
zSaF}5T)-nH#r>>-7i1~}1DIrKV1+~jkI>`=Jcf)elP~cYF!7X4X5lqp;#o1-3`E_U
coWX0z$TN8suOXw^<TJb)OuPw`zwvqj0H(r!NB{r;

delta 622
zcmeB^J|HvUf)Pgr0|Nsi0|TQH0}9|;1mQB8Kxi1r6StX(F^8FnCvI~Ai#e0!ngfgs
z3=C`yLJj&L7W)zq$-vNH)F2IFvHfe1XwYwv0<jqw8;lxUVd9ftv8f6|RI@Y)K}6a0
zCM&SZGe%5yVAo{qnViM0>A9qVWdg{C3t$r%8jK)xQw79Kj)VplkO)Tthy>dUb_bM?
zF!|MF1$H?m4w1<Y>>5lQ9+R^`RKnyb?DLp7Crmcs@R8vx02{&BU<9`CUQ=0v3B*&J
zd6VaG*mFLESjE*a`3Z*|6Ia7z6;2-+E{Me-ul<JVH-_lqiksZSY0r3V@)^!B9UeER
zB*gv94MGi2Wjq>S8BmCUUCzTa*^f(6@B>(sslf<h8272k4P2UxJ0`E<vSQ+1H(8Eb
zR{9XcJq%n8LJd1W%DG=aM7W=U<$pnV44g1|9tDU9kKANAZW%5fHz?O-at*f`51&S3
z3M3kM8Yb`K7L($c(ZCBbmVp6GvNW(l!kp*G<agYLjNc|J@E9=hYD^9SQBjjyKvd7<
bZ9ImI`zF8OF=Tu(S&CPKiBD*<3$GUdjA4)$

diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl
index a0576e30..a67414ee 100644
--- a/artifacts/mods/gl_highlighting.ssl
+++ b/artifacts/mods/gl_highlighting.ssl
@@ -35,19 +35,10 @@ variable highlightFailMsg1;
 variable highlightFailMsg2;
 
 procedure ToggleHighlightObject(variable obj, variable enable) begin
-   if (checkLOS) then begin
-      if obj and (not enable or not obj_blocking_line(dude_obj, tile_num(obj), BLOCKING_TYPE_SHOOT)) then begin
-         if (alsoContainer and obj_item_subtype(obj) == item_type_container) or (not NO_HIGHLIGHT(obj)) then begin
-            if (enable) then set_outline(obj, outlineColor);
-            else set_outline(obj, 0);
-         end
-      end
-   end else begin
-      if obj then begin
-         if (alsoContainer and obj_item_subtype(obj) == item_type_container) or (not NO_HIGHLIGHT(obj)) then begin
-            if (enable) then set_outline(obj, outlineColor);
-            else set_outline(obj, 0);
-         end
+   if obj and (not enable or not checkLOS or not obj_blocking_line(dude_obj, tile_num(obj), BLOCKING_TYPE_SHOOT)) then begin
+      if (alsoContainer and obj_item_subtype(obj) == item_type_container) or (not NO_HIGHLIGHT(obj)) then begin
+         if (enable) then set_outline(obj, outlineColor);
+         else set_outline(obj, 0);
       end
    end
 end