Commit before attempting to split ItemUse into prism + lenses

This commit is contained in:
2023-03-25 10:10:47 +00:00
parent ea0c942887
commit cdc4a84d4b
3 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -26,7 +26,7 @@ yourControl cr w
w
& cWorld . lWorld . creatures . ix (_crID cr)
%~ (wasdWithAiming w (_mvSpeed $ _crMvType cr) . mouseActionsCr (_mouseButtons (_input w)))
& pressedMBEffectsNoInventory pkeys
& pressedMBEffectsTopInventory pkeys
where
pkeys = w ^. input . mouseButtons
intopinv = fromMaybe False $ do
@@ -115,8 +115,8 @@ mouseActionsCr pkeys cr
theaction <- cr ^? crManipulation . manObject . inInventory . iselAction
return $ theaction == NoInvSelAction
pressedMBEffectsNoInventory :: M.Map SDL.MouseButton Bool -> World -> World
pressedMBEffectsNoInventory pkeys w
pressedMBEffectsTopInventory :: M.Map SDL.MouseButton Bool -> World -> World
pressedMBEffectsTopInventory pkeys w
| isDown SDL.ButtonLeft && isDown SDL.ButtonRight && inTopInv = useItem (you w) w
| isDown SDL.ButtonLeft && inTopInv = useLeftItem 0 w
| isDown SDL.ButtonMiddle =