From 17734738f68ba882ae09316a205cb614f53a6296 Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Sun, 15 Jan 2023 12:38:06 +0000
Subject: [PATCH] Remove equality derivation for hud elements

---
 src/Dodge/Data/HUD.hs      | 4 ++--
 src/Dodge/Data/Input.hs    | 1 -
 src/Dodge/Data/Universe.hs | 1 -
 src/Dodge/Render/HUD.hs    | 6 +++++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Dodge/Data/HUD.hs b/src/Dodge/Data/HUD.hs
index 6f1f95fbf..144b056f9 100644
--- a/src/Dodge/Data/HUD.hs
+++ b/src/Dodge/Data/HUD.hs
@@ -16,7 +16,7 @@ data HUDElement
         { _subInventory :: SubInventory
         }
     | DisplayCarte
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data SubInventory
     = NoSubInventory
@@ -25,7 +25,7 @@ data SubInventory
         , _subInvRegexInput :: Bool}
     | LockedInventory
     | DisplayTerminal {_termID :: Int}
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data HUD = HUD
     { _hudElement :: HUDElement
diff --git a/src/Dodge/Data/Input.hs b/src/Dodge/Data/Input.hs
index 57687b653..698a44602 100644
--- a/src/Dodge/Data/Input.hs
+++ b/src/Dodge/Data/Input.hs
@@ -8,7 +8,6 @@ import qualified Data.Map.Strict as M
 import Dodge.Data.CWorld
 import Geometry.Data
 import SDL (MouseButton, Scancode)
-import qualified Data.Text as T
 
 data PressType = InitialPress
     | ShortPress
diff --git a/src/Dodge/Data/Universe.hs b/src/Dodge/Data/Universe.hs
index 48b4b382b..454cce5a1 100644
--- a/src/Dodge/Data/Universe.hs
+++ b/src/Dodge/Data/Universe.hs
@@ -18,7 +18,6 @@ import Control.Lens
 --import qualified Data.Map.Strict as M
 import Data.Preload
 import Data.Sequence (Seq (..))
-import qualified Data.Text as T
 import Dodge.Data.Config
 import Dodge.Data.World
 import Loop.Data
diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs
index 969d394fa..d3714219a 100644
--- a/src/Dodge/Render/HUD.hs
+++ b/src/Dodge/Render/HUD.hs
@@ -328,9 +328,13 @@ determineInvSelCursorWidth w = case _rbOptions w of
     NoRightButtonOptions -> topInvW
     EquipOptions{}
         | ButtonRight `M.member` _mouseButtons (_input w)
-            && w ^? hud . hudElement . subInventory == Just NoSubInventory ->
+            && hasnosubinv ->
             47
         | otherwise -> topInvW
+  where
+    hasnosubinv = case w ^? hud . hudElement . subInventory of
+        Just NoSubInventory -> True
+        _ -> False
 
 combineListSelection :: World -> Maybe Int -> String -> Bool -> SelectionList ()
 combineListSelection w mi regex x =