From 27917f041ddb438c4fa8576487816220c3824eae Mon Sep 17 00:00:00 2001 From: Joris Guyonvarch Date: Thu, 19 Mar 2015 20:18:35 +0100 Subject: Fixing updates giving wrong states --- src/Update/Update.elm | 10 ++++++++-- src/Update/UpdateTimer.elm | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Update/Update.elm b/src/Update/Update.elm index 3bdcc2b..c6c5f32 100644 --- a/src/Update/Update.elm +++ b/src/Update/Update.elm @@ -11,6 +11,7 @@ import Time (Time) import Maybe import Keyboard (KeyCode) import Char +import Debug import Model.Model (..) import Model.Timer (..) @@ -38,6 +39,12 @@ type Action = updates : Signal.Channel Action updates = Signal.channel NoOp +logUpdate : Action -> Model -> Model +logUpdate action model = + case action of + DeltaTime _ -> update action model + _ -> update (Debug.log "action" action) model + update : Action -> Model -> Model update action model = case action of @@ -57,9 +64,8 @@ update action model = , timers <- substractTimersTime delta model.timers } UpdateTimer id action -> - let maybeTimerEdition = filterMaybe (\timerEdition -> timerEdition.id == id) model.timerEdition - in case model.timerEdition of + in case maybeTimerEdition of Just timerEdition -> { model | timers <- diff --git a/src/Update/UpdateTimer.elm b/src/Update/UpdateTimer.elm index c147d23..7033f81 100644 --- a/src/Update/UpdateTimer.elm +++ b/src/Update/UpdateTimer.elm @@ -41,6 +41,6 @@ updateTimer action timer = SetTime time -> let augmentedTime = time + 999 in { timer - | initialTime <- augmentedTime + | initialTime <- time , currentTime <- augmentedTime } -- cgit v1.2.3