| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2019-05-03 11:12:27 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2019-05-03 11:12:27 +0200 |
| commit | 91078b61683ad5f5fe5517c0de2bc03aab762bd5 (patch) | |
| tree | 3c4c1f07642bc419fc258f9c155f562e1fba329c | |
| parent | 96dd68f6f7a9d3c196127852e3078bb910c0d187 (diff) | |
| parent | dea436b41c8a53390f2c45fb9609d7f41aeb52e4 (diff) | |
Merge branch 'master' of dreamhost:~/repositories/git/tacticians-server
| -rw-r--r-- | src/shared/struct/inventory/shr_equipment.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/struct/inventory/shr_equipment.erl b/src/shared/struct/inventory/shr_equipment.erl index a931444..b56a83c 100644 --- a/src/shared/struct/inventory/shr_equipment.erl +++ b/src/shared/struct/inventory/shr_equipment.erl @@ -177,7 +177,7 @@ get_portrait_id (#shr_eq{ portrait = R }) -> shr_portrait:get_id(R). get_glyph_board_id (#shr_eq_ref{ glyph_board = R }) -> R; get_glyph_board_id (#shr_eq{ glyph_board = R }) -> shr_glyph_board:get_id(R). --spec get_glyph_ids (type()) -> list(shr_glyph:id()). +-spec get_glyph_ids (either()) -> list(shr_glyph:id()). get_glyph_ids (#shr_eq_ref{ glyphs = R }) -> R; get_glyph_ids (#shr_eq{ glyphs = R }) -> lists:map(fun shr_glyph:get_id/1, R). |