| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/reply/shr_add_glyph_board.erl | 6 | ||||
| -rw-r--r-- | src/shared/struct/inventory/shr_glyph_board.erl.m4 | 13 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/shared/reply/shr_add_glyph_board.erl b/src/shared/reply/shr_add_glyph_board.erl index 1d694f1..5776568 100644 --- a/src/shared/reply/shr_add_glyph_board.erl +++ b/src/shared/reply/shr_add_glyph_board.erl @@ -23,10 +23,6 @@ generate (GlyphBoard) -> {<<"msg">>, <<"add_glyph_board">>}, {<<"id">>, shr_glyph_board:get_id(GlyphBoard)}, {<<"nam">>, shr_glyph_board:get_name(GlyphBoard)}, - {<<"slot">>, shr_glyph_board:get_slots(GlyphBoard)}, - { - <<"omni">>, - shr_omnimods:encode(shr_glyph_board:get_omnimods(GlyphBoard)) - } + {<<"slot">>, shr_glyph_board:get_slots(GlyphBoard)} ] }. diff --git a/src/shared/struct/inventory/shr_glyph_board.erl.m4 b/src/shared/struct/inventory/shr_glyph_board.erl.m4 index 3324997..2d3311e 100644 --- a/src/shared/struct/inventory/shr_glyph_board.erl.m4 +++ b/src/shared/struct/inventory/shr_glyph_board.erl.m4 @@ -11,7 +11,6 @@ { id :: id(), name :: binary(), - omnimods :: shr_omnimods:type(), slots :: list(integer()) } ). @@ -35,7 +34,6 @@ [ get_id/1, get_name/1, - get_omnimods/1, get_slots/1 ] ). @@ -82,9 +80,6 @@ get_id (GlyphBoard) -> GlyphBoard#glyph_board.id. -spec get_name (type()) -> binary(). get_name (GlyphBoard) -> GlyphBoard#glyph_board.name. --spec get_omnimods (type()) -> shr_omnimods:type(). -get_omnimods (GlyphBoard) -> GlyphBoard#glyph_board.omnimods. - -spec get_slots (type()) -> list(non_neg_integer()). get_slots (GlyphBoard) -> GlyphBoard#glyph_board.slots. @@ -104,11 +99,15 @@ default () -> from_id(<<"0">>). ) -> shr_omnimods:type(). get_omnimods_with_glyphs (Glyphs, GlyphBoard) -> - BoardOmnimods = GlyphBoard#glyph_board.omnimods, BoardSlots = GlyphBoard#glyph_board.slots, {ok, Omnimods} = - get_omnimods_with_glyphs_internals(BoardOmnimods, Glyphs, BoardSlots), + get_omnimods_with_glyphs_internals + ( + shr_omnimods:new(), + Glyphs, + BoardSlots + ), Omnimods. |