summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-02-15 22:29:05 +0100
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-02-15 22:29:05 +0100
commit1e3ed11d30c5c6639de10caca2eea898e506e4cf (patch)
tree4bd676ed07ca71c46506b1fc3c1b54a9847e3466 /src/battle/mechanic/turn_action
parent11ba787cd7a9bbcd0dff71176285337375313409 (diff)
Markers/triggers, shr_tile -> shr_tile{,_instance}
Diffstat (limited to 'src/battle/mechanic/turn_action')
-rw-r--r--src/battle/mechanic/turn_action/btl_turn_actions_move.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/mechanic/turn_action/btl_turn_actions_move.erl b/src/battle/mechanic/turn_action/btl_turn_actions_move.erl
index 814239b..db46ef0 100644
--- a/src/battle/mechanic/turn_action/btl_turn_actions_move.erl
+++ b/src/battle/mechanic/turn_action/btl_turn_actions_move.erl
@@ -30,8 +30,8 @@ cross (_Map, _ForbiddenLocations, [], Cost, Location) ->
cross (Map, ForbiddenLocations, [Step|NextSteps], Cost, Location) ->
NextLocation = shr_location:apply_direction(Step, Location),
NextTileInstance = shr_map:get_tile_instance(NextLocation, Map),
- NextTileClassID = shr_tile:extract_main_class_id(NextTileInstance),
- NextTile = shr_tile:from_class_id(NextTileClassID),
+ NextTileClassID = shr_tile_instance:get_tile_id(NextTileInstance),
+ NextTile = shr_tile:from_id(NextTileClassID),
NextCost = (Cost + shr_tile:get_cost(NextTile)),
IsForbidden =
lists:foldl