| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-05-08 17:28:41 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2018-05-08 17:28:41 +0200 |
| commit | cdd59b539337c02e3ff5d44860e4287f07ce052d (patch) | |
| tree | 3abd27cb309d6977a107124ad3783360ee38f968 /src/battlemap | |
| parent | f3fb8dd2446914eb365d15782b8bfd712c26272b (diff) | |
...
Diffstat (limited to 'src/battlemap')
| -rw-r--r-- | src/battlemap/mk/debug.mk | 5 | ||||
| -rw-r--r-- | src/battlemap/src/query/character_turn.erl | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/battlemap/mk/debug.mk b/src/battlemap/mk/debug.mk index a4cccd7..7e88422 100644 --- a/src/battlemap/mk/debug.mk +++ b/src/battlemap/mk/debug.mk @@ -27,9 +27,10 @@ debug_rebuild: ################################################################################ ifeq ($(wildcard $(DIALYZER_PLT_FILE)),) debug_run: - $(DIALYZER) --build_plt --apps erts kernel stdlib jiffy --output_plt $(DIALYZER_PLT_FILE) + $(DIALYZER) --build_plt --apps erts kernel stdlib jiffy --output_plt \ + $(DIALYZER_PLT_FILE) $(MAKE) debug_rebuild - $(DIALYZER) --add_to_plt --plt $@ -r $(BIN_DIR) + $(DIALYZER) --add_to_plt --plt $(DIALYZER_PLT_FILE) -r $(BIN_DIR) else debug_run: $(MAKE) debug_rebuild diff --git a/src/battlemap/src/query/character_turn.erl b/src/battlemap/src/query/character_turn.erl index bafa982..70afbca 100644 --- a/src/battlemap/src/query/character_turn.erl +++ b/src/battlemap/src/query/character_turn.erl @@ -32,7 +32,9 @@ authenticate_user (Request) -> SessionToken = character_turn_request:get_session_token(Request), security:assert_identity(PlayerID, SessionToken), - security:lock_queries(PlayerID). + security:lock_queries(PlayerID), + + ok. %%%% MAIN LOGIC %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -spec fetch_data (character_turn_request:type()) -> character_turn_data:type(). @@ -70,7 +72,7 @@ assert_user_is_current_player (Data, Request) -> ) -> 'ok'. assert_user_owns_played_character (Data, Request) -> PlayerID = character_turn_request:get_player_id(Request), - CharacterInstance = character_turn_data:get_player_instance(Data), + CharacterInstance = character_turn_data:get_character_instance(Data), Character = character_instance:get_character(CharacterInstance), CharacterOwnerID = character:get_owner_id(Character), @@ -80,7 +82,7 @@ assert_user_owns_played_character (Data, Request) -> -spec assert_character_can_be_played (character_turn_data:type()) -> 'ok'. assert_character_can_be_played (Data) -> - CharacterInstance = character_turn_data:get_player_instance(Data), + CharacterInstance = character_turn_data:get_character_instance(Data), true = character_instance:get_is_active(CharacterInstance), @@ -132,7 +134,7 @@ handle_actions (Data, Request) -> EmptyUpdate = character_turn_update:new(Data), PostActionsUpdate = - lists:foldl(fun battle_turn_actions:handle/2, EmptyUpdate, Actions), + lists:foldl(fun turn_actions:handle/2, EmptyUpdate, Actions), finalize_character_instance(PostActionsUpdate). |