| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'www/handler/battlemap')
| -rw-r--r-- | www/handler/battlemap/character_turn.yaws | 14 | ||||
| -rw-r--r-- | www/handler/battlemap/load_state.yaws | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/www/handler/battlemap/character_turn.yaws b/www/handler/battlemap/character_turn.yaws index 495f451..3506e13 100644 --- a/www/handler/battlemap/character_turn.yaws +++ b/www/handler/battlemap/character_turn.yaws @@ -13,7 +13,7 @@ } ). --include("/tmp/timed_cache_data.hrl"). +-include("/my/src/tacticians-server/src/timed_cache_data.hrl"). parse_input (Req) -> JSONReqMap = jiffy:decode(Req, [return_maps]), @@ -32,25 +32,27 @@ handle (Req) -> %%%% Parse Input = parse_input(Req), %%%% Fetch - Battlemap = timed_cache:fetch(battlemap_db, Input#input.battlemap_id), - BattlemapInstance = + Battlemap = timed_cache:fetch(battlemap_db, Input#input.battlemap_id), + BattlemapInstance = timed_cache:fetch ( battlemap_instance_db, <<"0">> ), - {ok, CharInst} = + Character = timed_cache:fetch(character_db, Input#input.char_id), + CharInst = battlemap_instance:get_char_instance ( BattlemapInstance, Input#input.char_id ), %%%% Calc - {ok, {X, Y}} = + {X, Y} = battlemap:cross ( Battlemap, - CharInst, + character_instance:get_location(CharInst), + character:get_movement_points(Character), Input#input.path, battlemap_instance:get_char_instances(BattlemapInstance) ), diff --git a/www/handler/battlemap/load_state.yaws b/www/handler/battlemap/load_state.yaws index d68c6a4..5c37764 100644 --- a/www/handler/battlemap/load_state.yaws +++ b/www/handler/battlemap/load_state.yaws @@ -1,7 +1,7 @@ <erl> -record(input, {session_token, player_id, battlemap_id, instance_id}). --include("/tmp/timed_cache_data.hrl"). +-include("/my/src/tacticians-server/src/timed_cache_data.hrl"). parse_input (Req) -> JSONReqMap = jiffy:decode(Req, [return_maps]), @@ -20,7 +20,7 @@ generate_set_map (Battlemap) -> [ {<<"width">>, Battlemap#battlemap.width}, {<<"height">>, Battlemap#battlemap.height}, - {<<"content">>, array:to_list(Battlemap#battlemap.content)} + {<<"content">>, array:sparse_to_list(Battlemap#battlemap.content)} ] } ). |