From 0eeab768bd54a6a6a4b6370ddd116681039ca356 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sun, 22 Apr 2018 11:06:36 +0800
Subject: [PATCH] Fixed a bug in item highlighting that caused items to be kept
 highlighted when entering combat while holding the highlight key.

---
 artifacts/config_files/sfall-mods.ini |   2 +-
 artifacts/mods/gl_highlighting.int    | Bin 3428 -> 3620 bytes
 artifacts/mods/gl_highlighting.ssl    |  11 +++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/artifacts/config_files/sfall-mods.ini b/artifacts/config_files/sfall-mods.ini
index deeb425e..90e051a4 100644
--- a/artifacts/config_files/sfall-mods.ini
+++ b/artifacts/config_files/sfall-mods.ini
@@ -1,6 +1,6 @@
 [Highlighting]
 
-; DX scandode of a key to press to highlight items on the ground
+; DX scancode of a key to press to highlight items on the ground
 ;  42 - SHIFT key
 Key=42
 
diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int
index 31771aeafff59aec52f0ffa310ca08366b8d5d2e..db8e061be033b1c00bfb1324950aedd1e81ee8a5 100644
GIT binary patch
delta 1047
zcmaDNwM0gsf$0Dv0|SFl122eXahfO~ThGP7z`(|U0$3(Mxmr*fN`b|h85kJMpaM{e
zm5+ge0VM7Q6@XH#YZw?9m>3usf}jFWiVdd!0|P@nR18e9H9#~la)7yTf_)hS0|O%i
z1EUmN2+ZJo1Ev@lbs#j1<URsnF*-nK7|8?G&*;P;pa%hyg&C80cruGUGSf41GSf3k
zCKoeq;1+Vu&rM1!2`Meg+bqST!!+4}g@=hpYO)`TGvk-ZlUQmQCruV$6=!Uitif6$
z!X^U>P6nn1qXyRoX%L%@Yw`wGU&e&V|5!bp`#>TL3=Kw5xfcx*4f+jIU{OXSJ%<`3
z8eHKrtPMhN(_T#OVpA1_n8Vy41TlwQV)6ktc}Azn57;yr%O-QN%kr`{2sKqeOlI$!
zY{EW~al_<e?7q?yV0KLaMgP5~vIdg|eUKPO-()=wI{^;11{M&P^Aw0=V3}OQVaa%E
z@-_}%=~ZA6kTZWnS;i3SIU6R+acVNIn5@U4J~^LLg7Mqr4$g4KHIpB3N~$)1)q=bX
zwuXTb%x7v42GQJ6Ad-Q7vH+Kq1h)s60}4B^Qf?(MpMA0uml6}Vz~nS8D<*EX$+x&<
zrKKQ_WZ-NNYS;l%#q9tQ;kE<I2SIoY9B}yxhzNHXNM3vmgvY=D(#rsI%&N&2+-3?q
zketEPAOr~*R7E@tAVoHOJdG(3&-2(o;;=~oY!*v{8AKaT2qbGkwX-y^LSlobZt^N_
zJtm%YlW%dWb23B1f#=?2E*^DG76^}*Z?YASIwvcXXE!;EN1dMy%F6*;!!~&Vk2ohx
zY|7*VJnEe6P!;<of8bH%<bd*COqSwRl;?!-7{H;<z}}PuHU*qO8917fCI@g!006ow
B#@he@

delta 958
zcmZ1?^F&IZf$0Dv0|SFl122eX;g~2OThGbBz`(|U0$2i|TrDUKrNH9M3=9lrPyr~#
za*lz40VM7Q6@XH#ISdR8ObiSRK~MoG#rh4(c*MXE2W5gOHV3GNUtlhrU{7OUU|?im
zVB~=dff<}@z!U?c9E66E+!+uSqrzk*#_Y+n8P{!&Wm0D1XkZ5Un>%B2AB!{NmdTe`
zY8itj2e67WI!w-BEfHb81CnN7YA|YWZIA}BSx-&=!0OAWFxigH)7cLs!objA1d(G~
z(IC;F-yj7RWkl#<Yif{aaD~gTGzh^=V_Px#6q~9b#2lsuA*eYwCb7#iGEG)s*JL!C
z?8Pq2%i18+Q~@!V-EVRU`$Wcq$!r|H(g855CV*n`UQ=0vNrOH}jKgno9*3O(`>_TV
z5SOzHL^3c>-os(Z*fseZhp%)NSOnzC-%yq@#CA@H$#I;Tj2V;jIMgSv=agXFHu(f+
zIAg$M1ujW(Bd}VKkHOY(^MLtmljFFgB)EQoIiSD-OLAQS^Vud(;8J4ZIy89;mlYG&
zj>#XmWMsI`K-|T^(IC{Y1Eh@W6GVjT!{iTKveGON9s@f}o?8nd!mR<4=L~@I{3gHR
zHnZXNX-t7Qp1TVY1x*4VLm5~a%pl>xy$F)R85p4AtdP*;J~KInM~{j7&*UB+bxx)R
zVURSB&g4Bj>YU6_Ud-e-JnEb*P+reu8D4dLRw!>5NIe5<gAkZzY%qsd$KU|w!&E(*
zT*Rwx%m&fJ%hSLMiY~?!Fj)px3CV`c4Xj`uJ5;6F<TJdAf*cSY1K4d0>`h6N``9G_
D+G@KM

diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl
index bc394ca2..a96e0fbd 100644
--- a/artifacts/mods/gl_highlighting.ssl
+++ b/artifacts/mods/gl_highlighting.ssl
@@ -27,6 +27,7 @@
 
 variable configSection := "Highlighting";
 variable highlightKey;
+variable isHighlight;
 variable alsoContainer;
 variable alsoCorpse;
 variable checkLOS;
@@ -68,6 +69,7 @@ procedure KeyPressHandler begin
 
    if scanCode == highlightKey then begin
       if pressed then begin
+         isHighlight := true;
          if motionScanner then begin
             scanner := obj_carrying_pid_obj(dude_obj, PID_MOTION_SENSOR);
             if scanner then begin
@@ -90,11 +92,19 @@ procedure KeyPressHandler begin
             call ToggleHighlight(true);
          end
       end else begin
+         isHighlight := false;
          call ToggleHighlight(false);
       end
    end
 end
 
+procedure CombatTurnHandler begin
+   if isHighlight then begin
+      isHighlight := false;
+      call ToggleHighlight(false);
+   end
+end
+
 procedure start begin
    if game_loaded and (sfall_ver_major >= 4) then begin
       call InitConfigs;
@@ -111,5 +121,6 @@ procedure start begin
       highlightFailMsg2 := Translate("HighlightFail2", "Your motion sensor is out of charge.");
 
       register_hook_proc(HOOK_KEYPRESS, KeyPressHandler);
+      register_hook_proc(HOOK_COMBATTURN, CombatTurnHandler);
    end
 end