aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-06-13 14:03:01 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-06-13 14:03:01 +0200
commit158c04ad2ece69aeeb5bf812ec81bd85c3a8128e (patch)
tree40fae8c7e9ee5cfb0ee99762c8414a590449aee9
parent499c0981df958643097f96365138df689432e5b4 (diff)
downloadtacticians-client-master.zip
tacticians-client-master.tar.bz2
Fixes animation manager rewind.HEADmaster
-rw-r--r--src/battle/src/Struct/TurnResult.elm11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/battle/src/Struct/TurnResult.elm b/src/battle/src/Struct/TurnResult.elm
index 71768c3..aaf3dfa 100644
--- a/src/battle/src/Struct/TurnResult.elm
+++ b/src/battle/src/Struct/TurnResult.elm
@@ -148,7 +148,8 @@ apply_inverse_movement_step tile_omnimods movement characters players =
location =
(List.foldr
(BattleMap.Struct.Location.neighbor)
- (movement.destination)
+ (Struct.Character.get_location char)
+ --(movement.destination)
(List.map
(BattleMap.Struct.Direction.opposite_of)
movement.path
@@ -206,11 +207,9 @@ apply_player_defeat pdefeat characters players =
(
(Array.map
(\c ->
- (
- if ((Struct.Character.get_player_index c) == pdefeat.player_index)
- then (Struct.Character.set_defeated True c)
- else c
- )
+ if ((Struct.Character.get_player_index c) == pdefeat.player_index)
+ then (Struct.Character.set_defeated True c)
+ else c
)
characters
),