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/map | |
parent | 11ba787cd7a9bbcd0dff71176285337375313409 (diff) |
Markers/triggers, shr_tile -> shr_tile{,_instance}
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/query/map_load.erl | 2 | ||||
-rw-r--r-- | src/map/query/map_update.erl | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/map/query/map_load.erl b/src/map/query/map_load.erl index b8126dd..19facf6 100644 --- a/src/map/query/map_load.erl +++ b/src/map/query/map_load.erl @@ -80,7 +80,7 @@ fetch_data (Input) -> generate_reply (QueryState) -> Map = QueryState#query_state.map, - SetMap = shr_set_map:generate(Map), + SetMap = shr_set_map:generate(fun (_TriggerName) -> true end, Map), Output = jiffy:encode([SetMap]), Output. diff --git a/src/map/query/map_update.erl b/src/map/query/map_update.erl index 00f9a29..47d5ac5 100644 --- a/src/map/query/map_update.erl +++ b/src/map/query/map_update.erl @@ -12,7 +12,7 @@ map_id :: binary(), w :: non_neg_integer(), h :: non_neg_integer(), - t :: list(list(binary())) + t :: list(map()) } ). @@ -49,15 +49,6 @@ parse_input (Query) -> true = (MapWidth > 0), true = (MapHeight > 0), true = (length(MapContent) == (MapWidth * MapHeight)), - true = - lists:all - ( - fun (T) -> - [_M|[_V|B]] = T, - ((length(B) rem 2) == 0) - end, - MapContent - ), #input { |