aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-09-09 16:56:57 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-09-09 16:56:57 +0200
commitefc878dc634cdbf9ba976858ee6872fc7a59b485 (patch)
treef1af6c71e3a04b01375b8d0920987187c1b7e512
parent0c088b6c14006c0522cdfc71c36cd6941deef1d1 (diff)
downloadtacticians-server-efc878dc634cdbf9ba976858ee6872fc7a59b485.zip
tacticians-server-efc878dc634cdbf9ba976858ee6872fc7a59b485.tar.bz2
Spotted a mistake in shr_equipment.
I expected Dialyzer to point out this kind of error, though...
-rw-r--r--src/shared/reply/shr_add_glyph.erl1
-rw-r--r--src/shared/struct/inventory/shr_equipment.erl2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/reply/shr_add_glyph.erl b/src/shared/reply/shr_add_glyph.erl
index 2e4a259..cea10d2 100644
--- a/src/shared/reply/shr_add_glyph.erl
+++ b/src/shared/reply/shr_add_glyph.erl
@@ -23,6 +23,7 @@ generate (Glyph) ->
{<<"msg">>, <<"add_glyph">>},
{<<"id">>, shr_glyph:get_id(Glyph)},
{<<"nam">>, shr_glyph:get_name(Glyph)},
+ {<<"fam">>, shr_glyph:get_family_id(Glyph)},
{<<"omni">>, shr_omnimods:encode(shr_glyph:get_omnimods(Glyph))}
]
}.
diff --git a/src/shared/struct/inventory/shr_equipment.erl b/src/shared/struct/inventory/shr_equipment.erl
index ceeefd1..25cc8fb 100644
--- a/src/shared/struct/inventory/shr_equipment.erl
+++ b/src/shared/struct/inventory/shr_equipment.erl
@@ -496,7 +496,7 @@ default_unresolved () ->
glyphs =
lists:map
(
- fun (_E) -> shr_glyph:default() end,
+ fun (_E) -> shr_glyph:default_id() end,
shr_glyph_board:get_slots(shr_glyph_board:default())
)
}.