From 18644f37fd1d572ebb5c5a256ed294204edc54a8 Mon Sep 17 00:00:00 2001
From: "Mr.Stalin" <fakels@yandex.ru>
Date: Fri, 7 Apr 2017 23:58:26 +0300
Subject: [PATCH] Deleted duplicate code in the script. Added check for sfall
 version.

---
 artifacts/mods/gl_highlighting.int | Bin 3252 -> 3176 bytes
 artifacts/mods/gl_highlighting.ssl |  13 +++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int
index 5e8aed6f1db927f1e10d85d4b72054bd7a839856..600c83d22c0288379b9d580d78d77beb493aa2a5 100644
GIT binary patch
delta 614
zcmdlY`9fksVf_jQ1_ovZ1_l=f6u@Q!6%RoXW?*~7z`(%7z`&4zD$ZU2<v)YcP>OvQ
zRQ*4w0F>gG#K6G7$iN`PC;%0KQe0~`Gcmqql;BEFEs0OdNlY(hVBjfEEs4)BEy>Bu
zOWn-MY{95Mp)sXN-~b~70|QHgS%Y1JK8Ved(!dL%85qDMYXfV86o|z#VR8bCA>*OR
zlUNKHzf3;DV#ugA`5TKNW58q$R!zpL$w92Wi~^G%uuf*&Ho1gtGNa364)$cmS(9_v
zJsGPeZ(}!RteX6aUB+Yr$igEaBN-SPjGD?pECGfFhX&UMdx#S_l0ae%j15K&`e4-;
zCd+Y1a#l64KzR-vVv|pCG%~K5?8E6R-33z(mc7?h)?m^A_6ldm<Sm@`j0}^%aGEoA
zP1fP^mCk~xZTJmk8AH@^WlWyJWyi$%VDc5NaK?biI^2?iMqnijAZLJBJUo-bxD|xB
ze}Om*OfX^YE0a68HJG>$P2R+9#l*d1@;h!B8SXO;EMR3E4MGh&KrHT05E1SVlizX6
dO0z(C4D2v@9xaFnj|NDdGXTo-o7}=<008+Lhh+c&

delta 685
zcmaDMu|;x1Vf`Ei1_ovZ1_l=f6u@Qx6%RoXW?;L<z`(%7z`&4zD$bq)<v)YcP>OvW
zRQ*4w0F>gm$H2hA$iN`PC;%0KQd~baGcmqql;9~&Es4)BEy>BuOJ!i-N>43`Ps>S6
zFW$_`Y{979(wNeqe}IvJfhD4W7eq5KfJxQ{)&?mMi=}094vQh<w#oBY3>jZczQAJ0
zC^eah)sWF;vI(muW8UOA)?P-I$!}OEGp?H4z&4rDVzLN(GGpK53U*J%W0McD8`npH
z%wb?@5CYQ-4Mq(o!7RoG;|4p3?HpE65u*nE35*O33`f9xh6W=r&DtQ;Q~_}hM^FO`
z78ML|`C|<%AUzz%z^X1CVDte6NP|&RIY?N5p~0cS6>8}^kO%`~17S;#!7QDe!7-ij
z+ayk3#%q)PI3*dcOwQo6XY`r8g43Mw+T;hEzKq)@>v2gkZkg=CWyi#&Gr5B+oN><N
z2V9bZbzs{--UkObPsC&{ZUrG8H?S}h$PpkGkHTadZVe_LzR79aR!lrBlW%d$N=rce
s#K6%Y)UX4r$_^sJV*`?(tk1(P!oUufEQ3mxfFwERKzXw!TkseF02OVLVgLXD

diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl
index a447a1c1..2e825d33 100644
--- a/artifacts/mods/gl_highlighting.ssl
+++ b/artifacts/mods/gl_highlighting.ssl
@@ -34,10 +34,7 @@ variable highlightFailMsg2;
 
 procedure ToggleHighlightObject(variable obj, variable enable) 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) then begin
-         if (enable) then set_outline(obj, outlineColor);
-         else set_outline(obj, 0);
-      end else if (not NO_HIGHLIGHT(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
@@ -94,7 +91,7 @@ procedure KeyPressHandler begin
 end
 
 procedure start begin
-   if game_loaded then begin
+   if game_loaded and (sfall_ver_major >= 4) then begin
       call InitConfigs;
    
       highlightKey := GetConfig(configSection, "Key", 0);
@@ -102,9 +99,9 @@ procedure start begin
       outlineColor := GetConfig(configSection, "OutlineColor", 0);
       motionScanner := GetConfig(configSection, "MotionScanner", 1);
       
-		highlightFailMsg1 := Translate("HighlightFail1", "You aren't carrying a motion sensor.");
-		highlightFailMsg2 := Translate("HighlightFail2", "Your motion sensor is out of charge.");
-		
+      highlightFailMsg1 := Translate("HighlightFail1", "You aren't carrying a motion sensor.");
+      highlightFailMsg2 := Translate("HighlightFail2", "Your motion sensor is out of charge.");
+    
       register_hook_proc(HOOK_KEYPRESS, KeyPressHandler);
    end
 end