From 388a5de9948fe07b5fe89efe06bd2b824e418e75 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sun, 9 Jun 2024 12:09:05 +0800
Subject: [PATCH] Changed the game mode check in gl_highlighting_lite

* now opening other interfaces (inventory, options, etc.) will also
turn off highlight.
---
 .../gl_highlighting_lite.int                  | Bin 4968 -> 4968 bytes
 .../gl_highlighting_lite.ssl                  |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/artifacts/example_mods/ItemHighlight_Lite/gl_highlighting_lite.int b/artifacts/example_mods/ItemHighlight_Lite/gl_highlighting_lite.int
index b14045413ce37accb36baf84e0287576cb5b1530..b8c37c8a8f6967f77b9680f6d0f9ce83ca1d2bc4 100644
GIT binary patch
delta 36
kcmaE%_Cjrg5Fg9`|KIm-7UO%v2w|}aC^3UslXZk`08{S~)c^nh

delta 36
kcmaE%_Cjrg5FZNzGXukBF}^p95Eh$&5;K@JSx49g0Gs~?!T<mO

diff --git a/artifacts/example_mods/ItemHighlight_Lite/gl_highlighting_lite.ssl b/artifacts/example_mods/ItemHighlight_Lite/gl_highlighting_lite.ssl
index e9146675..a1bc8d0c 100644
--- a/artifacts/example_mods/ItemHighlight_Lite/gl_highlighting_lite.ssl
+++ b/artifacts/example_mods/ItemHighlight_Lite/gl_highlighting_lite.ssl
@@ -106,7 +106,7 @@ procedure KeyPressHandler begin
             scanCode := get_sfall_arg,
             scanner, charges;
 
-   if scanCode == highlightKey and not(get_game_mode bwand (INTFACELOOT bwor BARTER)) then begin
+   if scanCode == highlightKey and not(get_game_mode bwand bwnot(COMBAT bwor PCOMBAT)) then begin
       if pressed then begin
          set_global_script_repeat(REPEAT_FRAMES);
          if motionScanner then begin
@@ -143,9 +143,9 @@ procedure CombatTurnHandler begin
    end
 end
 
-// visual glitch fix, turn off highlight when opening loot/barter screens - for 3.8.29+
+// visual glitch fix, turn off highlight when opening other interfaces - for 3.8.29+
 procedure GameModeChangeHandler begin
-   if isHighlight and (get_game_mode bwand (INTFACELOOT bwor BARTER)) then begin
+   if isHighlight and (get_game_mode bwand bwnot(COMBAT bwor PCOMBAT)) then begin
       call ToggleHighlight(false);
    end
 end
@@ -179,7 +179,7 @@ procedure start begin
       register_hook_proc(HOOK_INVENTORYMOVE, InventoryMoveHandler);
       set_global_script_type(1);
    end else begin
-      if isHighlight and not(get_game_mode bwand (INTFACELOOT bwor BARTER)) then begin
+      if isHighlight and not(get_game_mode bwand bwnot(COMBAT bwor PCOMBAT)) then begin
          call ToggleHighlight(true);
       end
    end