Cleanup

src/Dodge/Update/Camera.hs

@@ -55,13 +55,13 @@ moveZoomCamera uv = uv
     vfoffset = do
         iscam <- yourItem w ^? _Just . itScope . scopeIsCamera
         guard iscam
-        guard (SDL.ButtonRight `M.member` _mouseButtons (_cWorld w))
+        guard (SDL.ButtonRight `M.member` _mouseButtons w)
         yourItem w ^? _Just . itScope . scopePos
     mscopeoffset = do
-        guard (SDL.ButtonRight `M.member` _mouseButtons (_cWorld w))
+        guard (SDL.ButtonRight `M.member` _mouseButtons w)
         yourItem w ^? _Just . itScope . scopePos
     newcen = cpos +.+ fromMaybe (V2 0 0) mscopeoffset +.+ offset
-    offset = rotateV (_cameraRot (_cWorld w)) $ ((newzoom - newDefaultZoom)/(newDefaultZoom*newzoom)) *.* _mousePos (_cWorld w)
+    offset = rotateV (_cameraRot (_cWorld w)) $ ((newzoom - newDefaultZoom)/(newDefaultZoom*newzoom)) *.* _mousePos w
     --newzoom = changeZoom (_cameraZoom w) idealZoom'
     newzoom = case yourItem w ^? _Just . itScope of
         Just zs@ZoomScope {} -> _scopeZoom zs
@@ -93,7 +93,7 @@ moveZoomCamera uv = uv
 
 updateScopeZoom :: World -> World
 updateScopeZoom w 
-    | SDL.ButtonRight `M.member` _mouseButtons (_cWorld w) 
+    | SDL.ButtonRight `M.member` _mouseButtons w 
       = case w ^? cWorld . creatures . ix 0 . crInv . ix (crSel (_creatures (_cWorld w) IM.! 0))
                           . itScope . scopeZoomChange of
         Just x 
@@ -127,7 +127,7 @@ zoomInLongGun w
     wp = _crInv (_creatures (_cWorld w) IM.! 0) IM.! crSel (_creatures (_cWorld w) IM.! 0)
     Just currentZoom = wp ^? itScope . scopeZoom
     newzoom = (wp ^?! itScope . scopeZoom) / zoomSpeed
-    mousep = rotateV (_cameraRot (_cWorld w)) $ _mousePos (_cWorld w)
+    mousep = rotateV (_cameraRot (_cWorld w)) $ _mousePos w
 
 zoomOutLongGun :: World -> World
 zoomOutLongGun w 
@@ -146,7 +146,7 @@ zoomOutLongGun w
 
 ifConfigWallRotate :: Configuration -> World -> World
 ifConfigWallRotate cfig w
-    | _gameplay_rotate_to_wall cfig && not (SDL.ButtonRight `M.member` _mouseButtons (_cWorld w))
+    | _gameplay_rotate_to_wall cfig && not (SDL.ButtonRight `M.member` _mouseButtons w)
                 = rotateToOverlappingWall w
     | otherwise = w
 
@@ -185,8 +185,8 @@ rotateCamera cfig w
     | keyr = rotateCameraBy (-0.025) w
     | otherwise = ifConfigWallRotate cfig w
   where
-    keyl = SDL.ScancodeQ `Set.member` _keys (_cWorld w) && notAtTerminal w
-    keyr = SDL.ScancodeE `Set.member` _keys (_cWorld w) && notAtTerminal w
+    keyl = SDL.ScancodeQ `Set.member` _keys w && notAtTerminal w
+    keyr = SDL.ScancodeE `Set.member` _keys w && notAtTerminal w
 
 -- TODO check where/how this is used
 notAtTerminal :: World -> Bool

src/Dodge/Update/UsingInput.hs

@@ -21,55 +21,55 @@ import Control.Lens
 updateUsingInput :: World -> World
 updateUsingInput w = case _hudElement $ _hud (_cWorld w) of
     DisplayInventory subinv 
-        -> updatePressedButtons subinv (_mouseButtons (_cWorld w)) w
+        -> updatePressedButtons subinv (_mouseButtons w) w
     DisplayCarte        
-        -> updatePressedButtonsCarte (_mouseButtons (_cWorld w)) w
+        -> updatePressedButtonsCarte (_mouseButtons w) w
 
 updatePressedButtons :: SubInventory -> M.Map MouseButton Bool -> World -> World
 updatePressedButtons subinv pkeys w = case subinv of
     NoSubInventory
-        | ButtonLeft `M.member` pkeys && w ^?! cWorld . hammers . ix SubInvHam /= HammerUp
-                    -> w & cWorld . hammers . ix SubInvHam .~ HammerDown
+        | ButtonLeft `M.member` pkeys && w ^?! hammers . ix SubInvHam /= HammerUp
+                    -> w & hammers . ix SubInvHam .~ HammerDown
         | otherwise -> updatePressedButtons' pkeys w
     CombineInventory mi
         | pkeys ^? ix ButtonLeft == Just False
-                -> maybeexitcombine (maybe id doCombine mi w) & cWorld . hammers . ix SubInvHam .~ HammerDown
+                -> maybeexitcombine (maybe id doCombine mi w) & hammers . ix SubInvHam .~ HammerDown
     DisplayTerminal tmid
         | pkeys ^? ix ButtonLeft == Just False && inTermFocus w 
                 -> doTerminalEffectLB (w ^?! cWorld . terminals . ix tmid) w
-                        & cWorld . hammers . ix SubInvHam .~ HammerDown
+                        & hammers . ix SubInvHam .~ HammerDown
         | pkeys ^? ix ButtonLeft == Just False
                 -> w    & cWorld . terminals . ix tmid . tmInput . tiFocus %~ const True
-                        & cWorld . hammers . ix SubInvHam .~ HammerDown
+                        & hammers . ix SubInvHam .~ HammerDown
     _ | ButtonLeft `M.member` pkeys
-            -> w & cWorld . hammers . ix SubInvHam .~ HammerDown
+            -> w & hammers . ix SubInvHam .~ HammerDown
     _ -> w
   where
     maybeexitcombine
-        | ButtonRight `M.member` _mouseButtons (_cWorld w) = id
+        | ButtonRight `M.member` _mouseButtons w = id
         | otherwise = cWorld . hud . hudElement .~ DisplayInventory NoSubInventory
 
 updatePressedButtons' :: M.Map MouseButton Bool -> World -> World
 updatePressedButtons' pkeys w 
     | isDown ButtonLeft && isDown ButtonRight && inTopInv 
-        = useItem (you w) w & cWorld . hammers . ix DoubleMouseHam .~ HammerDown
+        = useItem (you w) w & hammers . ix DoubleMouseHam .~ HammerDown
     | isDown ButtonLeft && (inTopInv || _timeFlow (_cWorld w) == RewindingLastFrame)
-            && w ^?! cWorld . hammers . ix DoubleMouseHam == HammerUp
+            && w ^?! hammers . ix DoubleMouseHam == HammerUp
         = useLeftItem (_yourID (_cWorld w)) w
     | isDown ButtonLeft && (inTopInv || _timeFlow (_cWorld w) == RewindingLastFrame)
-        = w & cWorld . hammers . ix DoubleMouseHam .~ HammerDown
+        = w & hammers . ix DoubleMouseHam .~ HammerDown
     | isDown ButtonRight && inTopInv = w
     | isDown ButtonMiddle 
         = w & cWorld . cameraRot     -~ rotation
-            & cWorld . clickMousePos .~ _mousePos (_cWorld w) 
-    | isDown ButtonLeft = w & cWorld . hammers . ix DoubleMouseHam .~ HammerDown
+            & cWorld . clickMousePos .~ _mousePos w 
+    | isDown ButtonLeft = w & hammers . ix DoubleMouseHam .~ HammerDown
     | otherwise = w
   where 
     inTopInv = case _hudElement (_hud (_cWorld w)) of
         DisplayInventory NoSubInventory -> True
         _ -> False
     isDown but = but `M.member` pkeys
-    rotation = angleBetween (_mousePos (_cWorld w)) (_clickMousePos (_cWorld w))
+    rotation = angleBetween (_mousePos w) (_clickMousePos (_cWorld w))
 
 
 -- note "sort" on the inventory indices; otherwise
@@ -90,15 +90,15 @@ doCombine i w = case combineItemListYou w ^? ix i of
 updatePressedButtonsCarte :: M.Map MouseButton Bool -> World -> World
 updatePressedButtonsCarte pkeys w 
     | isDown ButtonRight = w 
-        & cWorld . clickMousePos     .~ _mousePos (_cWorld w) 
+        & cWorld . clickMousePos     .~ _mousePos w 
         & cWorld . hud . carteCenter %~ (-.- trans)
     | isDown ButtonLeft = w 
-        & cWorld . clickMousePos     .~ _mousePos (_cWorld w) 
+        & cWorld . clickMousePos     .~ _mousePos w 
         & cWorld . hud . carteRot    -~ rot
         & cWorld . hud . carteZoom   *~ czoom
     | otherwise = w
   where 
     isDown but = but `M.member` pkeys
-    rot   = angleBetween (_mousePos (_cWorld w)) (_clickMousePos (_cWorld w))
-    czoom = magV (_mousePos (_cWorld w)) / magV (_clickMousePos (_cWorld w))
-    trans = rotateV (_carteRot (_hud (_cWorld w))) $ 1 / _carteZoom (_hud (_cWorld w)) *.* (_mousePos (_cWorld w) -.- _clickMousePos (_cWorld w))
+    rot   = angleBetween (_mousePos w) (_clickMousePos (_cWorld w))
+    czoom = magV (_mousePos w) / magV (_clickMousePos (_cWorld w))
+    trans = rotateV (_carteRot (_hud (_cWorld w))) $ 1 / _carteZoom (_hud (_cWorld w)) *.* (_mousePos w -.- _clickMousePos (_cWorld w))