summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-04-29 17:43:18 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-04-29 17:43:18 +0200
commitc28f8c07374493de31e5581dcd53ad99a2ff917a (patch)
tree5c8a2d384fa47ee3c16982c8d4d2775df5da2c0c /src/battle/struct
parentc21e6a963fc36005b1afd5e983049a17aff92aca (diff)
Dialyzer error, compiles, some issues w/ client.
Dialyzer says: bnt_join_battle.erl:103: The created fun has no local return bnt_join_battle.erl:122: The call shr_inventory:ataxia_add_equipment(shr_equipment:unresolved(),shr_inventory:type()) does not have an opaque term of type shr_equipment:type() as 1st argument bnt_join_battle.erl:310: Function repair_join_battle/6 will never be called shr_inventory:ataxia_add_equipment(shr_equipment:unresolved(),shr_inventory:type()) is defined, though... Still some hiccups with what is sent to the client.
Diffstat (limited to 'src/battle/struct')
-rw-r--r--src/battle/struct/btl_pending_battle.erl16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/battle/struct/btl_pending_battle.erl b/src/battle/struct/btl_pending_battle.erl
index 0e46a24..cb8cbfa 100644
--- a/src/battle/struct/btl_pending_battle.erl
+++ b/src/battle/struct/btl_pending_battle.erl
@@ -46,6 +46,8 @@
push_player_summary_ix/2,
ataxia_set_battle/2,
+ ataxia_set_battle/3,
+
ataxia_set_free_slots/2,
ataxia_set_battle_id/2,
ataxia_set_player_ids/2,
@@ -107,12 +109,22 @@ set_battle (Battle, PBattle) -> PBattle#pending_battle{ battle = Battle }.
-spec ataxia_set_battle (btl_battle:type(), type()) -> {type(), ataxic:basic()}.
ataxia_set_battle (Battle, PBattle) ->
+ ataxia_set_battle(Battle, ataxic:constant(Battle), PBattle).
+
+-spec ataxia_set_battle
+ (
+ btl_battle:type(),
+ ataxic:basic(),
+ type()
+ )
+ -> {type(), ataxic:basic()}.
+ataxia_set_battle (Battle, BattleAtaxiaUpdate, PBattle) ->
{
- PBattle#pending_battle{ battle = Battle },
+ set_battle(Battle, PBattle),
ataxic:update_field
(
get_battle_field(),
- ataxic:constant(Battle)
+ BattleAtaxiaUpdate
)
}.