Fix tick-incrementation regression

SimonAlling · Jan 8, 2025 · c8e02da · c8e02da
1 parent c065476
commit c8e02da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/Game.elm b/src/Game.elm
@@ -190,11 +190,11 @@ reactToTick config tick (( _, currentRound ) as midRoundState) =
     )
 
 
-tickResultToGameState : Tick -> TickResult ( LeftoverFrameTime, MidRoundState ) -> GameState
-tickResultToGameState tick tickResult =
+tickResultToGameState : TickResult ( Tick, LeftoverFrameTime, MidRoundState ) -> GameState
+tickResultToGameState tickResult =
     case tickResult of
-        RoundKeepsGoing s ->
-            Active NotPaused (Moving tick s)
+        RoundKeepsGoing ( tick, leftoverFrameTime, midRoundState ) ->
+            Active NotPaused (Moving tick ( leftoverFrameTime, midRoundState ))
 
         RoundEnds finishedRound ->
             RoundOver finishedRound Dialog.NotOpen

diff --git a/src/Main.elm b/src/Main.elm
@@ -135,14 +135,10 @@ update msg ({ config, pressedButtons } as model) =
 
         AnimationFrame { delta, leftoverTimeFromPreviousFrame, lastTick } midRoundState ->
             let
-                tick : Tick
-                tick =
-                    Tick.succ lastTick
-
                 ( tickResult, cmd ) =
                     MainLoop.consumeAnimationFrame config delta lastTick ( leftoverTimeFromPreviousFrame, midRoundState )
             in
-            ( { model | appState = InGame (tickResultToGameState tick tickResult) }
+            ( { model | appState = InGame (tickResultToGameState tickResult) }
             , cmd
             )
 

diff --git a/src/MainLoop.elm b/src/MainLoop.elm
@@ -14,7 +14,7 @@ import Types.Tick as Tick exposing (Tick)
 import Types.Tickrate as Tickrate
 
 
-consumeAnimationFrame : Config -> FrameTime -> Tick -> ( LeftoverFrameTime, MidRoundState ) -> ( TickResult ( LeftoverFrameTime, MidRoundState ), Cmd msg )
+consumeAnimationFrame : Config -> FrameTime -> Tick -> ( LeftoverFrameTime, MidRoundState ) -> ( TickResult ( Tick, LeftoverFrameTime, MidRoundState ), Cmd msg )
 consumeAnimationFrame config delta lastTick ( leftoverTimeFromPreviousFrame, midRoundState ) =
     let
         timeToConsume : FrameTime
@@ -25,7 +25,7 @@ consumeAnimationFrame config delta lastTick ( leftoverTimeFromPreviousFrame, mid
         timestep =
             1000 / Tickrate.toFloat config.kurves.tickrate
 
-        recurse : Tick -> ( LeftoverFrameTime, MidRoundState ) -> Cmd msg -> ( TickResult ( LeftoverFrameTime, MidRoundState ), Cmd msg )
+        recurse : Tick -> ( LeftoverFrameTime, MidRoundState ) -> Cmd msg -> ( TickResult ( Tick, LeftoverFrameTime, MidRoundState ), Cmd msg )
         recurse lastTickReactedTo ( timeLeftToConsume, midRoundStateSoFar ) cmdSoFar =
             if timeLeftToConsume >= timestep then
                 let
@@ -50,7 +50,7 @@ consumeAnimationFrame config delta lastTick ( leftoverTimeFromPreviousFrame, mid
                         )
 
             else
-                ( RoundKeepsGoing ( timeLeftToConsume, midRoundStateSoFar )
+                ( RoundKeepsGoing ( lastTickReactedTo, timeLeftToConsume, midRoundStateSoFar )
                 , cmdSoFar
                 )
     in