変愚蛮怒のメインリポジトリです
Revisión | 0ab66085b181d0d4169985827efe930306a461a1 (tree) |
---|---|
Tiempo | 2017-10-19 21:45:54 |
Autor | Deskull <desull@user...> |
Commiter | Deskull |
@@ -221,7 +221,7 @@ bool select_ring_slot = FALSE; | ||
221 | 221 | */ |
222 | 222 | void do_cmd_wield(void) |
223 | 223 | { |
224 | - int item, slot; | |
224 | + OBJECT_IDX item, slot; | |
225 | 225 | |
226 | 226 | object_type forge; |
227 | 227 | object_type *q_ptr; |
@@ -1018,7 +1018,7 @@ extern int show_inven(int target_item); | ||
1018 | 1018 | extern int show_equip(int target_item); |
1019 | 1019 | extern void toggle_inven_equip(void); |
1020 | 1020 | extern bool can_get_item(void); |
1021 | -extern bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode); | |
1021 | +extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode); | |
1022 | 1022 | |
1023 | 1023 | /* object2.c */ |
1024 | 1024 | extern void excise_object_idx(int o_idx); |
@@ -2629,7 +2629,7 @@ static bool get_item_allow(int item) | ||
2629 | 2629 | * @param i 選択アイテムID |
2630 | 2630 | * @return 正規のIDならばTRUEを返す。 |
2631 | 2631 | */ |
2632 | -static bool get_item_okay(int i) | |
2632 | +static bool get_item_okay(OBJECT_IDX i) | |
2633 | 2633 | { |
2634 | 2634 | /* Illegal items */ |
2635 | 2635 | if ((i < 0) || (i >= INVEN_TOTAL)) return (FALSE); |
@@ -2719,16 +2719,16 @@ bool can_get_item(void) | ||
2719 | 2719 | * We always erase the prompt when we are done, leaving a blank line,\n |
2720 | 2720 | * or a warning message, if appropriate, if no items are available.\n |
2721 | 2721 | */ |
2722 | -bool get_item(COMMAND_CODE *cp, cptr pmt, cptr str, int mode) | |
2722 | +bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode) | |
2723 | 2723 | { |
2724 | 2724 | OBJECT_IDX this_o_idx, next_o_idx = 0; |
2725 | 2725 | |
2726 | 2726 | char which = ' '; |
2727 | 2727 | |
2728 | 2728 | int j; |
2729 | - COMMAND_CODE k; | |
2730 | - COMMAND_CODE i1, i2; | |
2731 | - COMMAND_CODE e1, e2; | |
2729 | + OBJECT_IDX k; | |
2730 | + OBJECT_IDX i1, i2; | |
2731 | + OBJECT_IDX e1, e2; | |
2732 | 2732 | |
2733 | 2733 | bool done, item; |
2734 | 2734 |