Cleanup

src/Dodge/Creature/State/WalkCycle.hs

@@ -1,8 +1,7 @@
 {-# LANGUAGE LambdaCase #-}
 
 module Dodge.Creature.State.WalkCycle (
-    --    updateWalkCycle,
-    footstepSideEffect,
+    updateWalkCycle,
 ) where
 
 import Control.Lens
@@ -10,10 +9,18 @@ import Dodge.Data.World
 import Dodge.SoundLogic
 import Sound.Data
 
-updateWalkCycle :: Stance -> Stance
-updateWalkCycle s = case s ^. carriage of
-    Walking x ff | x > s ^. strideLength -> s & carriage .~ Walking 0 (normalGait ff)
-    _ -> s
+updateWalkCycle :: Creature -> World -> World
+updateWalkCycle cr =
+    case cr ^. crStance . carriage of
+        Walking x ff
+            | x > cr ^. crStance . strideLength ->
+                soundMultiFrom
+                    [FootstepSound i | i <- [0 .. 10]]
+                    (cr ^. crPos)
+                    (chooseFootSound ff)
+                    Nothing
+                    . over (cWorld . lWorld . creatures . ix (cr ^. crID) . crStance . carriage) resetStride
+        _ -> id
 
 resetStride :: Carriage -> Carriage
 resetStride (Walking _ ff) = Walking 0 (normalGait ff)
@@ -26,20 +33,6 @@ normalGait = \case
     RightForward -> LeftForward
     WasRightForward -> LeftForward
 
-footstepSideEffect :: Creature -> World -> World
-footstepSideEffect cr =
-        case cr ^. crStance . carriage of
-            Walking x ff
-                | x > cr ^. crStance . strideLength ->
-                    soundMultiFrom
-                        [FootstepSound i | i <- [0 .. 10]]
-                        (cr ^. crPos)
-                        (chooseFootSound ff)
-                        Nothing
-                .
-                    over (cWorld . lWorld . creatures . ix (cr ^. crID) . crStance . carriage) resetStride
-            _ -> id
-
 chooseFootSound :: FootForward -> SoundID
 chooseFootSound LeftForward = foot1S
 chooseFootSound _ = foot2S