From b2894268f675950f58120ed1bdcdd936b23acf60 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sun, 28 Jan 2018 18:15:35 +0800
Subject: [PATCH] Reverted item highlighting mod to the previous status (commit
 90485a205a532ba317e4e755126ca38bbf0b8582). #132

---
 artifacts/config_files/sfall-mods.ini |   6 ------
 artifacts/mods/gl_highlighting.int    | Bin 3720 -> 3428 bytes
 artifacts/mods/gl_highlighting.ssl    |  19 +++++--------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/artifacts/config_files/sfall-mods.ini b/artifacts/config_files/sfall-mods.ini
index c336d869..deeb425e 100644
--- a/artifacts/config_files/sfall-mods.ini
+++ b/artifacts/config_files/sfall-mods.ini
@@ -10,12 +10,6 @@ Containers=0
 ; Set to 1 to also highlight lootable corpses
 Corpses=0
 
-; Set to 1 to also highlight alive critters
-Critters=0
-
-; Set to 1 to ignore NO_HIGHLIGHT flag on objects and highlight them regardless
-IgnoreNoHighlight=0
-
 ; Set to 1 to only highlight objects in the player's line-of-sight
 CheckLOS=0
 
diff --git a/artifacts/mods/gl_highlighting.int b/artifacts/mods/gl_highlighting.int
index 59f3843b16cce407fadc1a2cbc74cf4e16a1fea5..31771aeafff59aec52f0ffa310ca08366b8d5d2e 100644
GIT binary patch
delta 1045
zcmeB>eIg~$z;u9-fq_A&ffq!xa7+|1tPfy-04)dwBUwP=%nS?+W-t*5&2o-`fdM4$
z2I0d<)*J=~1||juh9H;-gl7E)p&1@QX(+|!08#J7@CzyerP$LL7#J8C7#Mk=0#J%`
z4TQlc2ccmkcLs#Ts4$s}v2*fP#(9jFHis~oGEQE}e4nF%8RS#$jLCCYoS0a)On$&p
z%NR5{j#Zq|VR9L3i3sZ*kURrZgHeNPgEWZEdTR1NR$oSi$v$kJ&VC>f28ISBh#cFB
z28jm!1}U&8BSH^bQ-ef<D_n-9K?r6V+lt9I*i;1}<}ft~LCv`_nU7tbk!i9UyC$RA
z<N|hCUe*SorV5D3?0%DHu}@?yn5@I$D;)r{YXT_d?lqM)m^A2v#5nvWFW^+0yo*D^
zi~U#w3rL8w3q&$7HwZzLFfcTkfkoIF48b%5nB;)+*cyzQAmZ#05zem3|2TXZvnI!I
zN`k_NQ<E_RY>5PyB=5Ec7O)dOG?g_-O)lV*nB2$4Hu(T6$K)Cop2-DV5-Hqpw}P!<
zY!GTNhB$=V2rL2$N3h$udBA)&kV6~xgW1-N;55m=1aS)2FR&;mUcfrIu7LS$li9eH
zn79s2*5bBe;@UBJ9=D7P*BOZK88{k*8g_t`aeab_aDA9Ok6Tun1;S%shskqmK}5JU
zK=PacP@do9Kip<KygrR7kXYjGnrz1-CdIu7l3f@ep~up|3W+A}Gn4ap^q9E+OrFQ1
z&!{u`9FHCoPt4?hJbD5=Jq^6zz}f;L8C@pN;gz&yZ4d@Ij%OE$WMFL&0@I8Q=8!OA
zZ~*gRsve=35HdN3SJ9UTBF2~kHnj|_9+IP(8(6_Sc8DFkW>A&$z$!O@<xo{}Oitj_
F002~p(Y*iw

delta 1209
zcmaDN)gdd;z;u9-fq_A&ffq!xcuf>Ate?jK0a_3WMzVm!nHd-u%wQrAnpK8@fdM4$
z2I0d<)?Ew?3``6R3_&mv2+igKp&3~qG>l~HgQ)jn1Q`euWnf@nKf}Plz{tSBsD~uT
zz`(#22H`V0Kxi1rqXS_vI!)$c>{Q@M%qh-yF3Kz^NiAYv5Xwx?%P&gx%lF7k&&bJ4
z&nTHZk#Pazr_Dx8ri?NWRmGqX@x)M<%=~zA13M2#12ZVBcyuQFu{bfYGEJVuQp>nt
zvH+_%W8Y*A))EmmEs#6|Q-e{1YlAe1%_cE<1FJ7%-sFF*p3Yl9A`A=-Mo_tL4H6Cd
z4N_oHMkGBK8YCKA;WBIuLU7Z*P3~e-6@-|>)F1>ghh1&*0XBKb3>00gaM_H>57;yr
z=S=2em*r(|5NfJ`*vP(RvI+Y{#%q(0vHMDIgSlY>C{5gJDr+!l&<BZeY?-XbVaLLu
z)4(#hfkSliVh%wjE|baIIDEAaf#eyO8-yS#IU#(IKYoK{7#oZs?&F*>S&mba@xWv~
z4mBMv5wIi+OdFJstPN^4m(XNA4)w|ToDz)xCU<a#`S3urGBy~2jbLmLg4w{e4HA-#
z>klx3(o2H_DEvUGxW9o&aF~Pr!+inF=a?+OB_+YV56l5Y7esOfn9niUiA#xzyKQnB
zmlYFt&E#8LveFY8Sio{z4MGh&KrHTU5E1SzVEGde9s?&_{vAYw`_1HATryldA`mW*
z&}0j4GaJ5w#uP~4@c2QT-Xs7rm4T(f3=*6?X^@P`zyK9zg+v?AgvqP8^_X}LOuogf
z&-h_77mpqjufk+29z6lxfCgT0{A~e|j4qSU@kolZHVA_Z;B7#Wi<o?lN6~x(idYIr
z9RtJ};B?Nw*uV-FV~3h?55k+gfJa;$D#pi#Vnzwb&QK1BdOib)9AgXEJ=4ItA*Bv8
Z)MQSm$|$JHePET4I6_s)HQ9z&0{}1V|5gA1

diff --git a/artifacts/mods/gl_highlighting.ssl b/artifacts/mods/gl_highlighting.ssl
index d6c9e220..bc394ca2 100644
--- a/artifacts/mods/gl_highlighting.ssl
+++ b/artifacts/mods/gl_highlighting.ssl
@@ -4,7 +4,7 @@
 
    Previously was part of sfall itself, now a separate mod.
    Features:
-   - highlighting items on the ground, containers (optional), dead bodies (optional) and critters (optional)
+   - highlighting items, containers (optional) and lootable corpses (optional) on the ground
    - configurable hotkey is used to trigger highlight
    - only objects in direct line-of-sight of player are highlighted (optional)
    - motion scanner is required to enable highlight (optional)
@@ -29,8 +29,6 @@ variable configSection := "Highlighting";
 variable highlightKey;
 variable alsoContainer;
 variable alsoCorpse;
-variable alsoCritter;
-variable ignoreNoHighlight;
 variable checkLOS;
 variable outlineColor;
 variable motionScanner;
@@ -39,7 +37,7 @@ variable highlightFailMsg2;
 
 procedure ToggleHighlightObject(variable obj, variable enable) begin
    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 (ignoreNoHighlight or 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
@@ -53,17 +51,12 @@ procedure ToggleHighlight(variable enable) begin
          call ToggleHighlightObject(obj, enable);
       end
    end
-   foreach obj in list_as_array(LIST_CRITTERS) begin
-      if (alsoCorpse) then begin
+   if (alsoCorpse) then begin
+      foreach obj in list_as_array(LIST_CRITTERS) begin
          if critter_state(obj) == CRITTER_IS_DEAD and not NO_STEAL(obj) then begin
             call ToggleHighlightObject(obj, enable);
          end
       end
-      if (alsoCritter) then begin
-         if critter_state(obj) != CRITTER_IS_DEAD then begin
-            call ToggleHighlightObject(obj, enable);
-         end
-      end
    end
    tile_refresh_display;
 end
@@ -73,7 +66,7 @@ procedure KeyPressHandler begin
             scanCode := get_sfall_arg,
             scanner, charges;
 
-   if scanCode == highlightKey and not (get_game_mode BWAND INTFACELOOT) then begin
+   if scanCode == highlightKey then begin
       if pressed then begin
          if motionScanner then begin
             scanner := obj_carrying_pid_obj(dude_obj, PID_MOTION_SENSOR);
@@ -109,8 +102,6 @@ procedure start begin
       highlightKey := GetConfig(configSection, "Key", 0);
       alsoContainer := GetConfig(configSection, "Containers", 0);
       alsoCorpse := GetConfig(configSection, "Corpses", 0);
-      alsoCritter := GetConfig(configSection, "Critters", 0);
-      ignoreNoHighlight := GetConfig(configSection, "IgnoreNoHighlight", 0);
       checkLOS := GetConfig(configSection, "CheckLOS", 0);
       outlineColor := GetConfig(configSection, "OutlineColor", 16);
       if (outlineColor < 1) then outlineColor := 64;