X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Finventory%2Finventory-util.cpp;h=80b56267c7d7ae85b6f6a55da8b4e5a2bfefbf4c;hb=1e89db7419dd21d3e694b577cc86aa7d9d7cf993;hp=ab091981d4dfa6eac6f451d401cd9f14bd776e45;hpb=d771f4fc829a86c9f7b15a805a0d38dec9f4a4d9;p=hengbandforosx%2Fhengbandosx.git diff --git a/src/inventory/inventory-util.cpp b/src/inventory/inventory-util.cpp index ab091981d..80b56267c 100644 --- a/src/inventory/inventory-util.cpp +++ b/src/inventory/inventory-util.cpp @@ -15,6 +15,7 @@ #include "system/floor-type-definition.h" #include "system/item-entity.h" #include "system/player-type-definition.h" +#include "util/bit-flags-calculator.h" #include "util/int-char-converter.h" #include "util/quarks.h" #include "util/string-processor.h" @@ -312,7 +313,7 @@ bool verify(PlayerType *player_ptr, concptr prompt, INVENTORY_IDX item) void prepare_label_string(PlayerType *player_ptr, char *label, BIT_FLAGS mode, const ItemTester &item_tester) { concptr alphabet_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int offset = (mode == USE_EQUIP) ? INVEN_MAIN_HAND : 0; + int offset = match_bits(mode, USE_EQUIP, USE_EQUIP) ? INVEN_MAIN_HAND : 0; strcpy(label, alphabet_chars); for (int i = 0; i < 52; i++) { COMMAND_CODE index;