aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-05-08 17:14:28 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-05-08 17:14:28 +0200
commitf3fb8dd2446914eb365d15782b8bfd712c26272b (patch)
tree5fc3a23131667a93d82d559a8551db6fa5f4c68d
parentee302a23c6577fea89ed66c8bb1ea609dfd16ab3 (diff)
downloadtacticians-server-f3fb8dd2446914eb365d15782b8bfd712c26272b.zip
tacticians-server-f3fb8dd2446914eb365d15782b8bfd712c26272b.tar.bz2
...
-rw-r--r--src/battlemap/mk/debug.mk2
-rw-r--r--src/battlemap/src/query/character_turn.erl10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/battlemap/mk/debug.mk b/src/battlemap/mk/debug.mk
index 2b98ff3..a4cccd7 100644
--- a/src/battlemap/mk/debug.mk
+++ b/src/battlemap/mk/debug.mk
@@ -27,7 +27,7 @@ debug_rebuild:
################################################################################
ifeq ($(wildcard $(DIALYZER_PLT_FILE)),)
debug_run:
- $(DIALYZER) --build_plt --apps erts kernel stdlib jiffy --output_plt $@
+ $(DIALYZER) --build_plt --apps erts kernel stdlib jiffy --output_plt $(DIALYZER_PLT_FILE)
$(MAKE) debug_rebuild
$(DIALYZER) --add_to_plt --plt $@ -r $(BIN_DIR)
else
diff --git a/src/battlemap/src/query/character_turn.erl b/src/battlemap/src/query/character_turn.erl
index ece2f28..bafa982 100644
--- a/src/battlemap/src/query/character_turn.erl
+++ b/src/battlemap/src/query/character_turn.erl
@@ -105,21 +105,21 @@ assert_user_permissions (Data, Request) ->
)
-> character_turn_update:type().
finalize_character_instance (Update) ->
- Data = character_instance_update:get_data(Update),
- CharacterInstance = character_instance_data:get_character_instance(Data),
+ Data = character_turn_update:get_data(Update),
+ CharacterInstance = character_turn_data:get_character_instance(Data),
DisabledCharacterInstance =
character_instance:set_is_active(false, CharacterInstance),
UpdatedData =
- character_instance_data:set_character_instance
+ character_turn_data:set_character_instance
(
DisabledCharacterInstance,
Data
),
- FinalizedData = character_instance_data:cleanup(UpdatedData),
+ FinalizedData = character_turn_data:cleanup(UpdatedData),
- character_instance_update:set_data(FinalizedData, Update).
+ character_turn_update:set_data(FinalizedData, Update).
-spec handle_actions
(