Cleanup

src/Dodge/Item/Draw.hs

@@ -11,11 +11,11 @@ import Control.Lens
 import Data.Maybe
 pictureWeaponOnAim
     :: Creature 
-    -> Int  -- ^ Position of item in inventory
+    -> Item
     -> SPic
-pictureWeaponOnAim cr i = pictureWeaponOnAimItem (itSPic it) cr i
-  where
-    it = _crInv cr IM.! i
+pictureWeaponOnAim cr itm = case _itInvPos itm of
+    Just i -> pictureWeaponOnAimItem (itSPic itm) cr i
+    Nothing -> mempty
 
 itSPic :: Item -> SPic
 itSPic it = _dimSPic (_itDimension it) it
@@ -23,11 +23,14 @@ itSPic it = _dimSPic (_itDimension it) it
 pictureWeaponAim
     :: (Item -> SPic)
     -> Creature 
-    -> Int  -- ^ Position of item in inventory
+    -> Item  -- ^ Position of item in inventory
     -> SPic
-pictureWeaponAim f cr i = pictureWeaponOnAimItem pic cr i
-  where
-    pic = f (_crInv cr IM.! i)
+pictureWeaponAim = const
+--pictureWeaponAim f cr itm = pictureWeaponOnAimItem pic cr i
+--  where
+--    pic = f itm
+--    i = fromJust $ _itInvPos itm
+    --pic = f (_crInv cr IM.! i)
 
 {- | Places an item picture onto a creature when the item is selected. -}
 pictureWeaponOnAimItem
@@ -84,10 +87,10 @@ twoFlatHRot cr = 2*strideRot cr
 pictureItem
     :: SPic 
     -> Creature 
-    -> Int  -- ^ Position of item in inventory
+    -> Item  -- ^ Position of item in inventory
     -> SPic
-pictureItem p cr posInInv 
-    | _crInvSel cr == posInInv = drawnWep
-    | otherwise                = emptyBlank
+pictureItem p cr itm = case _itInvPos itm of
+    Just posInInv | _crInvSel cr == posInInv -> drawnWep
+    _ -> emptyBlank
   where 
     drawnWep = translateSPf (_crRad cr) 0 p

src/Dodge/Item/Equipment.hs

@@ -65,10 +65,10 @@ frontArmour = defaultEquipment
     , _itEffect = NoItEffect
     , _itID = Nothing
     }
-pictureOnEquip :: SPic -> Creature -> Int -> SPic
-pictureOnEquip sp cr i 
-    | isJust (cr ^? crInvEquipped . ix i) = sp
-    | otherwise = mempty
+pictureOnEquip :: SPic -> Creature -> Item -> SPic
+pictureOnEquip sp cr itm = case _itInvPos itm of
+    Just i | isJust (cr ^? crInvEquipped . ix i) -> sp
+    _ -> mempty
 
 flatShield :: Item
 flatShield = defaultEquipment