| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2019-01-04 15:22:38 +0100 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2019-01-04 15:22:38 +0100 |
| commit | 895a5348f521b16b3a6e32d921f7f23ec8f3036e (patch) | |
| tree | db58fd02820ca4c87a0a057dad2e5e6ee110210a | |
| parent | c6336feed0e96854a9cc9952ad541a25589c15e1 (diff) | |
Fixes -pa arg w/ yaws, {btl/rst}_character mixup.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/bounty/bnt_join_battle.erl | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -24,7 +24,7 @@ ERL ?= erl ERL_OPTS ?= -connect_all false -pa `find $(BIN_DIR) -type d` YAWS ?= yaws -YAWS_OPTS ?= $(ERL_NAME_VS_SNAME) query_node -erlarg "$(ERL_OPTS)" +YAWS_OPTS ?= $(ERL_NAME_VS_SNAME) query_node -erlarg '$(ERL_OPTS)' DIALYZER ?= dialyzer DIALYZER_OPTS ?= @@ -111,7 +111,7 @@ run_db_node: build $(ERL_EXEC) $(ERL_NAME_VS_SNAME) db_node -run db_node start run_query_node: build $(YAWS_CONFIG_FILE) - $(YAWS_EXEC) --conf $(YAWS_CONFIG_FILE) + $(YAWS_EXEC) --conf $(YAWS_CONFIG_FILE) clean: # Preprocessor diff --git a/src/bounty/bnt_join_battle.erl b/src/bounty/bnt_join_battle.erl index 71b6eb1..f97b20b 100644 --- a/src/bounty/bnt_join_battle.erl +++ b/src/bounty/bnt_join_battle.erl @@ -44,7 +44,7 @@ update_ordset (New, Old) -> -spec get_equipment_ids ( - list(btl_character:type()) + list(rst_character:type()) ) -> { @@ -61,9 +61,9 @@ get_equipment_ids (Characters) -> lists:foldl ( fun (Character, {UPIDs, UWIDs, UAIDs}) -> - {MWpID, SWpID} = btl_character:get_weapon_ids(Character), - AID = btl_character:get_armor_id(Character), - PID = btl_character:get_portrait_id(Character), + {MWpID, SWpID} = rst_character:get_weapon_ids(Character), + AID = rst_character:get_armor_id(Character), + PID = rst_character:get_portrait_id(Character), { ordsets:add_element(PID, UPIDs), ordsets:add_element(MWpID, ordsets:add_element(SWpID, UWIDs)), |