From b3e2b8b5b8e550d0ac4909f9b38eb7cd2d660755 Mon Sep 17 00:00:00 2001 From: NovaRain Date: Wed, 17 Jan 2018 21:22:37 +0800 Subject: [PATCH] Rearranged and simplified gl_highlighting.ssl from the previous commit a bit. --- artifacts/config_files/sfall-mods.ini | 10 +++++----- artifacts/mods/gl_highlighting.int | Bin 18708 -> 3720 bytes artifacts/mods/gl_highlighting.ssl | 16 +++++++--------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/artifacts/config_files/sfall-mods.ini b/artifacts/config_files/sfall-mods.ini index f59dddaf..c336d869 100644 --- a/artifacts/config_files/sfall-mods.ini +++ b/artifacts/config_files/sfall-mods.ini @@ -5,17 +5,17 @@ Key=42 ; Set to 1 to also highlight containers -Containers=1 - -; Set to 1 to ignore NO_HIGHLIGHT flag on objects and highlight them regardless -IgnoreNoHighlight=0 +Containers=0 ; Set to 1 to also highlight lootable corpses -Corpses=1 +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 b771c35259fcc8ac13dfb292329d1d4957878d31..59f3843b16cce407fadc1a2cbc74cf4e16a1fea5 100644 GIT binary patch literal 3720 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