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/shared/reply/shr_set_map.erl
parent11ba787cd7a9bbcd0dff71176285337375313409 (diff)
Markers/triggers, shr_tile -> shr_tile{,_instance}
Diffstat (limited to 'src/shared/reply/shr_set_map.erl')
-rw-r--r--src/shared/reply/shr_set_map.erl15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/shared/reply/shr_set_map.erl b/src/shared/reply/shr_set_map.erl
index b335302..0096b52 100644
--- a/src/shared/reply/shr_set_map.erl
+++ b/src/shared/reply/shr_set_map.erl
@@ -7,7 +7,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate/1]).
+-export([generate/2]).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16,8 +16,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate (shr_map:type()) -> {list(any())}.
-generate (Map) ->
+-spec generate
+ (
+ fun ((shr_tile_instance:trigger_name()) -> boolean()),
+ shr_map:type()
+ )
+ -> {list(any())}.
+generate (TriggerVisibilityFun, Map) ->
{
[
{<<"msg">>, <<"set_map">>},
@@ -27,7 +32,9 @@ generate (Map) ->
<<"t">>,
lists:map
(
- fun shr_tile:instance_to_binary_list/1,
+ fun (E) ->
+ shr_tile_instance:encode(TriggerVisibilityFun, E)
+ end,
tuple_to_list(shr_map:get_tile_instances(Map))
)
}