From ec6eec260d6383ae948505c3d42b3055ae3dd94c Mon Sep 17 00:00:00 2001 From: nsensfel Date: Fri, 26 Apr 2019 15:05:44 +0200 Subject: Makes Dialyzer validate shared & battle. --- src/battle/query/btl_character_turn.erl | 2 +- src/battle/query/btl_load.erl | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/battle/query') diff --git a/src/battle/query/btl_character_turn.erl b/src/battle/query/btl_character_turn.erl index 455dd13..2048391 100644 --- a/src/battle/query/btl_character_turn.erl +++ b/src/battle/query/btl_character_turn.erl @@ -183,7 +183,7 @@ handle (Query) -> S0Update = fetch_data(Request), assert_user_permissions(S0Update, Request), - S1Update = btl_turn_actions:apply_requested_actions(S0Update, Request), + S1Update = btl_turn_actions_management:handle(S0Update, Request), commit_update(S1Update, Request), shr_security:unlock_queries(PlayerID), diff --git a/src/battle/query/btl_load.erl b/src/battle/query/btl_load.erl index 583cd4b..456f468 100644 --- a/src/battle/query/btl_load.erl +++ b/src/battle/query/btl_load.erl @@ -83,7 +83,7 @@ generate_reply (QueryState, Input) -> PlayerID = Input#input.player_id, PUser = ataxia_security:user_from_id(PlayerID), Battle = QueryState#query_state.battle, - RelevantInventory = btl_battle:get_relevant_inventory(Battle), + RelevantInventory = btl_battle:get_related_inventory(Battle), Players = btl_battle:get_players(Battle), {value, {PlayerIX, _Player}} = @@ -133,7 +133,7 @@ generate_reply (QueryState, Input) -> lists:map ( fun (PortraitID) -> - btl_add_portrait:generate(shr_portrait:from_id(PortraitID)) + shr_add_portrait:generate(shr_portrait:from_id(PortraitID)) end, ordsets:to_list(shr_inventory:get_portraits(RelevantInventory)) ), @@ -142,7 +142,7 @@ generate_reply (QueryState, Input) -> lists:map ( fun (WeaponID) -> - btl_add_weapon:generate(shr_weapon:from_id(WeaponID)) + shr_add_weapon:generate(shr_weapon:from_id(WeaponID)) end, ordsets:to_list(shr_inventory:get_weapons(RelevantInventory)) ), @@ -151,7 +151,7 @@ generate_reply (QueryState, Input) -> lists:map ( fun (ArmorID) -> - btl_add_armor:generate(shr_armor:from_id(ArmorID)) + shr_add_armor:generate(shr_armor:from_id(ArmorID)) end, ordsets:to_list(shr_inventory:get_armors(RelevantInventory)) ), @@ -160,7 +160,7 @@ generate_reply (QueryState, Input) -> lists:map ( fun (GlyphID) -> - btl_add_glyph:generate(shr_glyph:from_id(GlyphID)) + shr_add_glyph:generate(shr_glyph:from_id(GlyphID)) end, ordsets:to_list(shr_inventory:get_glyphs(RelevantInventory)) ), @@ -169,7 +169,7 @@ generate_reply (QueryState, Input) -> lists:map ( fun (GlyphBoardID) -> - btl_add_glyph_board:generate(shr_glyph_board:from_id(GlyphBoardID)) + shr_add_glyph_board:generate(shr_glyph_board:from_id(GlyphBoardID)) end, ordsets:to_list(shr_inventory:get_glyph_boards(RelevantInventory)) ), -- cgit v1.2.3-70-g09d2