Remove _crTwist

src/Dodge/Render/Picture.hs

@@ -57,7 +57,7 @@ fpsText x = color col . text $ "ms/frame " ++ show x
 drawMenuOrHUD :: Configuration -> Universe -> Picture
 drawMenuOrHUD cfig u = case u ^. uvScreenLayers of
     [] -> drawHUD (u ^. uvConfig) (u ^. uvWorld)
-    (lay : _) -> drawMenuScreen cfig (u ^? uvWorld . input . mouseContext . mcoMenuClick) lay
+    (x : _) -> drawMenuScreen cfig (u ^? uvWorld . input . mouseContext . mcoMenuClick) x
 
 drawConcurrentMessage :: Universe -> Picture
 drawConcurrentMessage u =
@@ -239,12 +239,13 @@ drawGapPlus x =
 aimDelaySweep :: World -> Picture
 aimDelaySweep w = fold $ do
     cr <- w ^? cWorld . lWorld . creatures . ix 0
-    aimstatus <- cr ^? crStance . posture
-    guard (aimstatus == Aiming)
-    return $ drawSweep cr w
+--    aimstatus <- cr ^? crStance . posture
+--    guard (aimstatus == Aiming)
+    Aiming {} <- cr ^? crStance . posture
+    return $ drawAimSweep cr w
 
-drawSweep :: Creature -> World -> Picture
-drawSweep cr w = fromMaybe mempty $ do
+drawAimSweep :: Creature -> World -> Picture
+drawAimSweep cr w = fold $ do
     a <- safeArgV (mwp -.- p)
     let a'
             | a - cdir > pi = cdir + 2 * pi

src/Dodge/Render/ShapePicture.hs

@@ -87,7 +87,6 @@ extraPics cfig u =
         <> foldMap drawTractorBeam (_tractorBeams lw)
         <> foldMap drawLinearShockwave (_linearShockwaves lw)
         <> foldMap drawShockwave (_shockwaves lw)
---        <> foldMap drawLaser (_lasersToDraw lw)
         <> foldMap drawTeslaArc (_teslaArcs lw)
         <> foldMap drawRadarSweep (_radarSweeps lw)
         <> foldMap drawFlame (_flames lw)