From deed13c71a23cc9d2279887bc7a77446cae0b454 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Fri, 10 Nov 2017 16:30:25 +0100 Subject: Changes format for server replies. --- src/battlemap_load_state.erl | 39 +++++++++++++-------------------------- src/shim_database.erl | 2 +- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/battlemap_load_state.erl b/src/battlemap_load_state.erl index 43fde3d..f311946 100644 --- a/src/battlemap_load_state.erl +++ b/src/battlemap_load_state.erl @@ -17,33 +17,20 @@ handle (Req) -> ), %% ok = users_manager:ping(UserToken), jiffy:encode( - { + [ [ - { - <<"types">>, - [ - <<"SET_MAP">>, - lists:map( - fun (_Char) -> - <<"ADD_CHAR">> - end, - CharList - ) - ] - }, - { - <<"data">>, + <<"set_map">>, + battlemap_battlemap:encode_in_json(Battlemap) + ] + | + lists:map( + fun (Char) -> [ - battlemap_battlemap:encode_in_json(Battlemap) - | - lists:map( - fun (Char) -> - battlemap_character:encode_in_json(Char) - end, - CharList - ) + <<"add_char">>, + battlemap_character:encode_in_json(Char) ] - } - ] - } + end, + CharList + ) + ] ). diff --git a/src/shim_database.erl b/src/shim_database.erl index 4628664..8e7c383 100644 --- a/src/shim_database.erl +++ b/src/shim_database.erl @@ -2,7 +2,7 @@ -export([fetch/2]). fetch(battlemaps_db, Object_ID) -> - io:format("~nGenerating neew Battlemap ~p... ~n", [Object_ID]), + io:format("~nGenerating new Battlemap ~p... ~n", [Object_ID]), Width = (rand:uniform(54) + 10), Height = (rand:uniform(54) + 10), {ok, -- cgit v1.2.3-70-g09d2