| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-02-15 22:29:05 +0100 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-02-15 22:29:05 +0100 |
| commit | 1e3ed11d30c5c6639de10caca2eea898e506e4cf (patch) | |
| tree | 4bd676ed07ca71c46506b1fc3c1b54a9847e3466 /src/battle/struct | |
| parent | 11ba787cd7a9bbcd0dff71176285337375313409 (diff) | |
Markers/triggers, shr_tile -> shr_tile{,_instance}
Diffstat (limited to 'src/battle/struct')
| -rw-r--r-- | src/battle/struct/btl_battle.erl | 4 | ||||
| -rw-r--r-- | src/battle/struct/btl_character_current_data.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl index 7237072..2a09244 100644 --- a/src/battle/struct/btl_battle.erl +++ b/src/battle/struct/btl_battle.erl @@ -12,7 +12,7 @@ used_armor_ids :: ordsets:ordset(shr_armor:id()), used_weapon_ids :: ordsets:ordset(shr_weapon:id()), used_portrait_ids :: ordsets:ordset(shr_portrait:id()), - used_tile_ids :: ordsets:ordset(shr_tile:class_id()), + used_tile_ids :: ordsets:ordset(shr_tile:id()), map :: shr_map:type(), characters :: orddict:orddict(non_neg_integer(), btl_character:type()), players :: orddict:orddict(non_neg_integer(), btl_player:type()), @@ -99,7 +99,7 @@ get_used_weapon_ids (Battle) -> Battle#battle.used_weapon_ids. -spec get_used_armor_ids (type()) -> ordsets:ordset(shr_armor:id()). get_used_armor_ids (Battle) -> Battle#battle.used_armor_ids. --spec get_used_tile_ids (type()) -> ordsets:ordset(shr_tile:class_id()). +-spec get_used_tile_ids (type()) -> ordsets:ordset(shr_tile:id()). get_used_tile_ids (Battle) -> Battle#battle.used_tile_ids. -spec get_map (type()) -> shr_map:type(). diff --git a/src/battle/struct/btl_character_current_data.erl b/src/battle/struct/btl_character_current_data.erl index 0be920b..3f25345 100644 --- a/src/battle/struct/btl_character_current_data.erl +++ b/src/battle/struct/btl_character_current_data.erl @@ -48,8 +48,8 @@ -> shr_omnimods:type(). location_to_omnimods (Location, Map) -> TileInstance = shr_map:get_tile_instance(Location, Map), - TileClassID = shr_tile:extract_main_class_id(TileInstance), - Tile = shr_tile:from_class_id(TileClassID), + TileClassID = shr_tile_instance:get_tile_id(TileInstance), + Tile = shr_tile:from_id(TileClassID), shr_tile:get_omnimods(Tile). |