Minor tweaking, argument refining

src/Dodge/Creature/Action/Blink.hs

@@ -26,7 +26,7 @@ blinkActionMousePos cr w =
         & inverseShockwaveAt cpos 40 2 2
   where
     cid = _crID cr
-    p1 = mouseWorldPos w
+    p1 = mouseWorldPos (w ^. input) (w ^. cWorld . lWorld . camPos)
     cpos = _crPos cr
     --p2 = bouncePoint (const True) 1 cpos p1 w
     p2 = pushIntoMaybe $ collideCircWalls cpos p1 r (wlsNearSeg cpos p1 w)
@@ -70,7 +70,7 @@ unsafeBlinkAction cr w
         wl <- snd $ collidePointWallsFilter (const True) mwp cpos w
         return (isLHS mwp `uncurry` _wlLine wl)
     cid = _crID cr
-    mwp = mouseWorldPos w
+    mwp = mouseWorldPos (w ^. input) (w ^. cWorld . lWorld . camPos)
     cpos = _crPos cr
 
 blinkShockwave ::
@@ -96,7 +96,7 @@ blinkActionFail cr w =
     distR = 120
     distortionBulge = RadialDistortion cpos (cpos +.+ V2 distR 0) (cpos +.+ V2 0 distR) 1.9
     cid = _crID cr
-    p1 = mouseWorldPos w
+    p1 = mouseWorldPos (w ^. input) (w ^. cWorld . lWorld . camPos)
     cpos = _crPos cr
     p2 = bouncePoint (const True) 1 cpos p1 w
     r = 1.5 * _crRad cr

src/Dodge/Creature/Picture/Awareness.hs

@@ -24,9 +24,10 @@ creatureDisplayText w cr =
                 , \cr' -> [crDisplayAwareness cr']
                 ]
             )
-            w
+            lw
             cr
   where
+    lw = w ^. cWorld . lWorld
     campos = w ^. cWorld . lWorld . camPos . camViewFrom
     theScale = 0.15 / (w ^. cWorld . lWorld . camPos . camZoom)
     cpos = _crPos cr

src/Dodge/Creature/YourControl.hs

@@ -61,7 +61,7 @@ wasdWithAiming w speed cr
     movAbs = rotateV (w ^. cWorld . lWorld . camPos . camRot) $ normalizeV movDir
     isAiming = _posture (_crStance cr) == Aiming
     mouseDir = case cr ^? crInv . ix (crSel cr) . itScope . scopePos of
-        Just _ -> argV $ mouseWorldPos w -.- _crPos cr
+        Just _ -> argV $ mouseWorldPos (w ^. input) (w ^. cWorld . lWorld . camPos) -.- _crPos cr
         _ -> argV (_mousePos (_input w)) + (w ^. cWorld . lWorld . camPos . camRot)
 
 wasdM :: SDL.Scancode -> Point2