summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-09-25 16:08:43 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2017-09-25 16:08:43 +0200
commit9293fb062b0bf66995c72b30e037c762318be000 (patch)
treeb20c47fcf589fb0f05d7c500766b1f427a8a9243 /client/elm/battlemap/src/Update/EndTurn.elm
parent1edd31d9972a7dec8cd54889e33bfdf1d5838670 (diff)
Introduces 'States' for the model.
Diffstat (limited to 'client/elm/battlemap/src/Update/EndTurn.elm')
-rw-r--r--client/elm/battlemap/src/Update/EndTurn.elm7
1 files changed, 4 insertions, 3 deletions
diff --git a/client/elm/battlemap/src/Update/EndTurn.elm b/client/elm/battlemap/src/Update/EndTurn.elm
index 3490d57..cc81028 100644
--- a/client/elm/battlemap/src/Update/EndTurn.elm
+++ b/client/elm/battlemap/src/Update/EndTurn.elm
@@ -44,7 +44,8 @@ update_model model nav char_id =
apply_to : Model.Type -> Model.Type
apply_to model =
- case (model.navigator, model.selection) of
+ case (model.state, model.navigator) of
(_, Nothing) -> model
- (Nothing, _) -> model
- ((Just nav), (Just char_id)) -> (update_model model nav char_id)
+ ((Model.MovingCharacter char_id), (Just nav)) ->
+ (update_model model nav char_id)
+ (_, _) -> model