Fix combine item menu

src/Dodge/Event.hs

@@ -98,7 +98,7 @@ handlePressedMouseButton but w
         _ -> Just w
     | otherwise = Just w
 
--- note "reverse" on the inventory indices; otherwise
+-- note "sort" on the inventory indices; otherwise
 -- lower items may be shifted up and items below these removed instead
 doCombine :: Int -> World -> World
 doCombine i w = case combineItemListYou w !? i of
@@ -106,7 +106,7 @@ doCombine i w = case combineItemListYou w !? i of
     Just (is,it) -> enterCombineInv
         . uncurry (putItemInInvID yid)
         . copyItemToFloorID (_crPos $ you w) it
-        $ foldr (rmInvItem yid) w (reverse is) & enterCombineInv
+        $ foldr (rmInvItem yid) w (sort is)
   where
     yid = _yourID w
 

src/Dodge/Item/Weapon/BulletGun/Cane.hs

@@ -313,7 +313,7 @@ miniGunXPict i spin _ =
     , mempty
     )
   where
-    aBarrel = translateSH (V3 15 0 2) baseCaneShape
+    aBarrel = translateSH (V3 15 2 2) baseCaneShape
     barrels = concatMap (\an -> aBarrel & rotateSHx (2*pi * fromIntegral an / fromIntegral i)) [1..i]
     a = fromIntegral spin / 100
     --x = fromIntegral am / 10

src/Dodge/Render/HUD.hs

@@ -100,8 +100,9 @@ subInventoryDisplay cfig w = case _inventoryMode w of
             return $ listCursorNSW subInvX 60 cfig cpos col 15 csize
         , fromMaybe mempty $ do
             i <- mi
+            cpos <- combinePoss w !? i
             lnks <- combineListLnks w !? i
-            return $ uncurry (lnkMidPosInvSels cfig w) lnks 
+            return $ (lnkMidPosInvSels cfig w) cpos (snd lnks)
                 <> foldMap (cursorAtInvSel listCursorNESW cfig w) (snd lnks)
         ]
     InspectInventory -> invHead cfig "INSPECT"

src/Dodge/Render/MenuScreen.hs

@@ -1,8 +1,7 @@
 {- The menu picture.  -}
 module Dodge.Render.MenuScreen
     ( menuScreen
-    )
+    ) where
-    where
 import Dodge.Data
 import Dodge.Base.Window
 import Picture