Make use hammers and item positions slightly more logical

src/Dodge/Data.hs

@@ -465,7 +465,7 @@ data PressPlate = PressPlate
     }
 data FloorItem = FlIt { _flIt :: Item , _flItPos :: Point2 , _flItRot :: Float, _flItID :: Int}
 data ItemPos 
-    = InInv   { _ipCrId :: Int , _ipInvId :: Int }
+    = InInv   { _ipCrID :: Int , _ipInvID :: Int }
     | OnFloor { _ipFlID :: Int }
     | VoidItm
 data ItemUse
@@ -473,14 +473,14 @@ data ItemUse
         { _rUse         :: Item -> Creature -> World -> World 
         , _useDelay     :: UseDelay
         , _useMods      :: [(Item -> Creature -> World -> World) -> Item -> Creature -> World -> World]
-        , _useHammer'   :: HammerPosition
+        , _useHammer    :: HammerPosition
         , _useAim       :: AimParams
         , _heldScroll   :: Float -> Creature -> Item -> Item
         }
     | LeftUse  
         { _lUse         :: Item -> Creature -> World -> World 
         , _useDelay     :: UseDelay
-        , _useHammer    :: HammerType
+        , _useHammer    :: HammerPosition
         , _eqEq         :: Equipment
         }
     | ConsumeUse 
@@ -532,7 +532,7 @@ data Item = Item
     , _itType       :: ItemType
     , _itAttachment :: ItAttachment
     , _itID         :: Maybe Int
-    , _itInvPos     :: Maybe Int
+    , _itPos        :: ItemPos
     , _itIsHeld     :: Bool
     , _itEffect     :: ItEffect
     , _itInvSize    :: Float