Cleanup

src/Dodge/Creature/Impulse/UseItem.hs

@@ -4,7 +4,6 @@ module Dodge.Creature.Impulse.UseItem (
     useItem,
 ) where
 
-import Dodge.ToggleExamine
 import Control.Lens
 import Data.Maybe
 import Dodge.Data.ComposedItem
@@ -124,3 +123,10 @@ toggleEquipmentAt invid cr w = case getEquipmentAllocation invid w of
     itm = itmat invid
     onequip itm' = doItmCrWdWd ((_eeOnEquip . _uequipEffect . _itUse) itm') itm'
     onremove itm' = doItmCrWdWd ((_eeOnRemove . _uequipEffect . _itUse) itm') itm'
+
+toggleExamineInv :: World -> World
+toggleExamineInv w = case w ^? hud . hudElement . subInventory of
+    Just ExamineInventory{} -> w & thepointer .~ NoSubInventory
+    _ -> w & thepointer .~ ExamineInventory
+  where
+    thepointer = hud . hudElement . subInventory

src/Dodge/Update/Input/InGame.hs

@@ -438,7 +438,6 @@ updateInitialPressInGame uv sc = case sc of
     ScancodeP -> pauseGame uv
     ScancodeF -> over uvWorld youDropItem uv
     ScancodeM -> toggleMap uv
-    --    ScancodeR -> over (uvWorld . cWorld . lWorld . creatures . ix 0) crReloadToggle uv
     ScancodeT -> over uvWorld testEvent uv
     ScancodeC -> toggleCombineInv uv
     -- the following should be put in a more sensible place