Minor cleanups
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
module Dodge.Creature.Impulse.UseItem
|
||||
( useItem
|
||||
, tryUseItem
|
||||
( tryUseItem
|
||||
, useLeftItem
|
||||
) where
|
||||
import Dodge.Data
|
||||
@@ -10,12 +9,6 @@ import qualified Data.IntMap.Strict as IM
|
||||
import Control.Lens
|
||||
import Data.Maybe
|
||||
|
||||
useItem :: Int -> World -> World
|
||||
useItem cid w = tryUseItem cr w -- itemEffect cr it w
|
||||
where
|
||||
cr = _creatures w IM.! cid
|
||||
--it = _crInv cr IM.! _crInvSel cr
|
||||
|
||||
tryUseItem :: Creature -> World -> World
|
||||
tryUseItem cr' w = fromMaybe w $ do
|
||||
cr <- w ^? creatures . ix (_crID cr')
|
||||
|
||||
@@ -3,6 +3,7 @@ module Dodge.Update.UsingInput
|
||||
( updateUsingInput
|
||||
) where
|
||||
import Dodge.Data
|
||||
import Dodge.Base.You
|
||||
import Dodge.Creature.Impulse.UseItem
|
||||
import Geometry
|
||||
|
||||
@@ -17,7 +18,7 @@ updateUsingInput w = if _carteDisplay w
|
||||
|
||||
updatePressedButtons :: S.Set MouseButton -> World -> World
|
||||
updatePressedButtons pkeys w
|
||||
| lbPressed && rbPressed = useItem (_yourID w) w
|
||||
| lbPressed && rbPressed = tryUseItem (you w) w
|
||||
| lbPressed = useLeftItem (_yourID w) w
|
||||
| lbPressed = w
|
||||
| mbPressed = w & clickMousePos .~ _mousePos w
|
||||
|
||||
Reference in New Issue
Block a user