Move targeting to dedicated datatype within item

2022-02-22 21:49:10 +00:00
parent 055fcf4cce
commit 8a7d06783d
9 changed files with 48 additions and 29 deletions
@@ -369,7 +369,6 @@ data Item = Item
    , _itInvSize    :: Float
    , _itInvDisplay :: Item -> [String]
    , _itInvColor   :: Color
-    , _itTargeting :: Maybe (World -> Maybe Point2, Int -> Item -> Creature -> World -> Picture)
    , _itTargeting' :: Targeting
    , _itDimension  :: ItemDimension
    , _itCurseStatus :: CurseStatus
@@ -383,7 +382,7 @@ data Targeting
    | TargetingOnHeld
        { _tgPos        :: Maybe Point2
        , _tgHeldUpdate :: Item -> Creature -> World -> Targeting -> Targeting
-        , _tgDraw       :: Item -> Creature -> World -> Picture
+        , _tgDraw       :: Int -> Item -> Creature -> World -> Picture
        }
 data ModuleSlot
    = ModBullet