Improve item location code

2024-09-22 14:29:02 +01:00
parent 236f7c7750
commit 4f6431968c
25 changed files with 218 additions and 186 deletions
@@ -16,10 +16,11 @@ import ShapePicture

 itemEquipPict :: Creature -> Item -> SPic
 itemEquipPict cr it = case it ^. itUse of
-    HeldUse{} | _itIsRoot it -> overPosSP (heldItemOffset it cr) (itemSPic it)
+    HeldUse{} | it ^? itLocation . ilIsRoot == Just True 
+        -> overPosSP (heldItemOffset it cr) (itemSPic it)
    ituse -> fromMaybe mempty $ do
        attachpos <- ituse ^? equipEffect . eeAttachPos
-        i <- it ^? itLocation . ipInvID
+        i <- it ^? itLocation . ilInvID
        epos <- cr ^? crInvEquipped . ix i
        return $ equipPosition epos cr attachpos (itemSPic it)