Enable duct taping torches to rifles

2022-07-14 11:32:32 +01:00
parent 2cfa3ca3a7
commit 79791d0df2
18 changed files with 109 additions and 154 deletions
@@ -482,8 +482,6 @@ data ItemUse
        , _useMods      :: [(Item -> Creature -> World -> World) -> Item -> Creature -> World -> World]
        , _useHammer    :: HammerPosition
        , _useAim       :: AimParams
-        , _heldAttachPos    :: Point3
-        , _heldAttachment :: HeldAttachment
        , _heldScroll   :: Float -> Creature -> Item -> Item
        }
    | LeftUse  
@@ -572,10 +570,9 @@ data Targeting
        , _tgActive :: Bool
        }
 data ItemDimension = ItemDimension
-    { _dimRad    :: Float
-    , _dimCenter :: Point3
--    , _dimPortage :: ItemPortage
--    , _dimSPic   :: Item -> SPic
+    { _dimRad       :: Float
+    , _dimCenter    :: Point3
+    , _dimAttachPos :: Point3
    }
 data ItemPortage 
    = HeldItem