diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2015-04-24 00:25:18 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2015-04-30 02:22:20 -0400 |
| commit | f9f245a109bff84a030f917122eeb9b6336a982c (patch) | |
| tree | ae6c65e6ab1dbd6a93c8aad3301059d9003f7e80 /src/map | |
| parent | 543924caa81c3469a90388e5112dcd93abf6eec9 (diff) | |
| download | tmwa-f9f245a109bff84a030f917122eeb9b6336a982c.tar.gz tmwa-f9f245a109bff84a030f917122eeb9b6336a982c.tar.bz2 tmwa-f9f245a109bff84a030f917122eeb9b6336a982c.tar.xz tmwa-f9f245a109bff84a030f917122eeb9b6336a982c.zip | |
remove item labels
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.cpp | 12 | ||||
| -rw-r--r-- | src/map/itemdb.cpp | 1 | ||||
| -rw-r--r-- | src/map/itemdb.hpp | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 7739966..46d857d 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -3037,10 +3037,10 @@ ATCE atcommand_idsearch(Session *s, dumb_ptr<map_session_data>, for (ItemNameId i = wrap<ItemNameId>(0); i < wrap<ItemNameId>(-1); i = next(i)) { P<struct item_data> item = TRY_UNWRAP(itemdb_exists(i), continue); - if (item->jname.contains_seq(item_name)) + if (item->name.contains_seq(item_name)) { match++; - output = STRPRINTF("%s: %d"_fmt, item->jname, item->nameid); + output = STRPRINTF("%s: %d"_fmt, item->name, item->nameid); clif_displaymessage(s, output); } } @@ -3975,9 +3975,9 @@ ATCE atcommand_character_item_list(Session *s, dumb_ptr<map_session_data> sd, AString output; if (true) - output = STRPRINTF("%d %s (%s, id: %d) %s"_fmt, + output = STRPRINTF("%d %s (id: %d) %s"_fmt, pl_sd->status.inventory[i].amount, - item_data->name, item_data->jname, + item_data->name, pl_sd->status.inventory[i].nameid, AString(equipstr)); clif_displaymessage(s, output); @@ -4051,9 +4051,9 @@ ATCE atcommand_character_storage_list(Session *s, dumb_ptr<map_session_data> sd, } AString output; if (true) - output = STRPRINTF("%d %s (%s, id: %d)"_fmt, + output = STRPRINTF("%d %s (id: %d)"_fmt, stor->storage_[i].amount, - item_data->name, item_data->jname, + item_data->name, stor->storage_[i].nameid); clif_displaymessage(s, output); } diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index 7dd725e..7b23503 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -188,7 +188,6 @@ bool itemdb_readdb(ZString filename) item_data idv {}; idv.nameid = item.id.data; idv.name = item.name.data; - idv.jname = item.jname.data; idv.type = item.type.data; idv.value_buy = item.buy_price.data ?: item.sell_price.data * 2; idv.value_sell = item.sell_price.data ?: item.buy_price.data / 2; diff --git a/src/map/itemdb.hpp b/src/map/itemdb.hpp index 5e19c0b..19f40a8 100644 --- a/src/map/itemdb.hpp +++ b/src/map/itemdb.hpp @@ -36,7 +36,7 @@ namespace map struct item_data { ItemNameId nameid; - ItemName name, jname; + ItemName name; int value_buy; int value_sell; ItemType type; |