Remove item picture field, handled by outside function

src/Dodge/Item/Draw.hs

@@ -2,37 +2,31 @@ module Dodge.Item.Draw
     ( pictureWeaponOnAim
     , pictureWeaponAim
     , twoFlatHRot
-    , itSPic
+    , itemSPic
     , itemEquipPict
     ) where
 import Dodge.Data
---import Dodge.Picture.Layer
---import Picture
---import Shape
 import ShapePicture
 import Dodge.Creature.HandPos
 import Dodge.Item.Equipment.Shape
+import Dodge.Item.Draw.SPic
 
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
 import Data.Maybe
 
-
 itemEquipPict :: Creature -> Item -> SPic
 itemEquipPict cr it = case it ^?! itUse of
     RightUse {} ->  pictureWeaponOnAim cr it
     ituse -> case ituse ^? eqEq of
-        Just _ -> pictureOnEquip (itSPic it) cr it
+        Just _ -> pictureOnEquip (itemSPic it) cr it
         Nothing -> mempty
 
 pictureWeaponOnAim
     :: Creature 
     -> Item
     -> SPic
-pictureWeaponOnAim = pictureWeaponAim itSPic
-
-itSPic :: Item -> SPic
-itSPic it = _dimSPic (_itDimension it) it
+pictureWeaponOnAim = pictureWeaponAim itemSPic
 
 pictureWeaponAim
     :: (Item -> SPic)