Cleanup

src/Dodge/Creature/YourControl.hs

@@ -19,7 +19,7 @@ yourControl cr w
     | inTermFocus w = dimCreatureLight cr w & updateUsingInput
     | otherwise = dimCreatureLight cr w
         & cWorld . creatures . ix (_crID cr) %~ 
-            (wasdWithAiming w (_mvSpeed $ _crMvType cr) . mouseActionsCr (_mouseButtons (_cWorld w)))
+            (wasdWithAiming w (_mvSpeed $ _crMvType cr) . mouseActionsCr (_mouseButtons w))
         & updateUsingInput
 
 dimCreatureLight :: Creature -> World -> World
@@ -35,7 +35,7 @@ wasdWithAiming
     -> Creature
 wasdWithAiming w speed cr
     | isAiming  = addAnyTwist $ set crDir mouseDir $ theMovement cr
-    | crIsReloading cr && SDL.ButtonRight `M.member` _mouseButtons (_cWorld w)
+    | crIsReloading cr && SDL.ButtonRight `M.member` _mouseButtons w
                 = addAnyTwist $ set crDir (mouseDir + anytwist) $ theMovement cr
     | otherwise = theMovement $ theTurn $ removeTwist cr
   where 
@@ -57,7 +57,7 @@ wasdWithAiming w speed cr
     isAiming = _posture (_crStance cr) == Aiming
     mouseDir = case cr ^? crInv . ix (crSel cr) . itScope . scopePos of
         Just _ -> argV $ mouseWorldPos w -.- _crPos cr
-        _ -> argV (_mousePos (_cWorld w)) + _cameraRot (_cWorld w)
+        _ -> argV (_mousePos w) + _cameraRot (_cWorld w)
 
 wasdM :: SDL.Scancode -> Point2
 wasdM scancode = case scancode of
@@ -68,7 +68,7 @@ wasdM scancode = case scancode of
     _             -> V2   0    0
 
 wasdDir :: World -> Point2
-wasdDir = foldr ((+.+) . wasdM) (V2 0 0) . _keys . _cWorld
+wasdDir = foldr ((+.+) . wasdM) (V2 0 0) . _keys
 
 {- | Set posture according to mouse presses. -}
 mouseActionsCr :: M.Map SDL.MouseButton Bool -> Creature -> Creature