summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/game-logic')
-rw-r--r--src/battle/game-logic/btl_movement.erl6
-rw-r--r--src/battle/game-logic/btl_turn_actions.erl2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/game-logic/btl_movement.erl b/src/battle/game-logic/btl_movement.erl
index 87b1806..f78eca1 100644
--- a/src/battle/game-logic/btl_movement.erl
+++ b/src/battle/game-logic/btl_movement.erl
@@ -19,7 +19,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-spec cross
(
- btl_battlemap:type(),
+ btl_map:type(),
list(btl_location:type()),
list(btl_direction:enum()),
non_neg_integer(),
@@ -30,7 +30,7 @@ cross (_Battlemap, _ForbiddenLocations, [], Cost, Location) ->
{Location, Cost};
cross (Battlemap, ForbiddenLocations, [Step|NextSteps], Cost, Location) ->
NextLocation = btl_location:apply_direction(Step, Location),
- NextTileClassID = btl_battlemap:get_tile_class_id(NextLocation, Battlemap),
+ NextTileClassID = btl_map:get_tile_class_id(NextLocation, Battlemap),
NextTileID = btl_tile:class_id_to_type_id(NextTileClassID),
NextTile = btl_tile:from_id(NextTileID),
NextCost = (Cost + btl_tile:get_cost(NextTile)),
@@ -50,7 +50,7 @@ cross (Battlemap, ForbiddenLocations, [Step|NextSteps], Cost, Location) ->
-spec cross
(
- btl_battlemap:type(),
+ btl_map:type(),
list(btl_location:type()),
list(btl_direction:enum()),
btl_location:type()
diff --git a/src/battle/game-logic/btl_turn_actions.erl b/src/battle/game-logic/btl_turn_actions.erl
index e7153f9..d46818f 100644
--- a/src/battle/game-logic/btl_turn_actions.erl
+++ b/src/battle/game-logic/btl_turn_actions.erl
@@ -79,7 +79,7 @@ get_path_cost_and_destination (Data, Path) ->
Character = btl_character_turn_data:get_character(Data),
CharacterIX = btl_character_turn_data:get_character_ix(Data),
Battle = btl_character_turn_data:get_battle(Data),
- Battlemap = btl_battle:get_battlemap(Battle),
+ Battlemap = btl_battle:get_map(Battle),
ForbiddenLocations =
array:foldl