/* Move each label */
for (i = 0; i < 52; i++)
{
- int index;
+ COMMAND_CODE index;
char c = alphabet_chars[i];
/* Find a tag with this label */
*/
COMMAND_CODE show_inven(int target_item)
{
- int i, j, k, l, z = 0;
+ COMMAND_CODE i;
+ int j, k, l, z = 0;
int col, cur_col, len;
object_type *o_ptr;
char o_name[MAX_NLEN];
char tmp_val[80];
- int out_index[23];
+ COMMAND_CODE out_index[23];
byte out_color[23];
char out_desc[23][MAX_NLEN];
- int target_item_label = 0;
- int wid, hgt;
+ COMMAND_CODE target_item_label = 0;
+ TERM_POSITION wid, hgt;
char inven_label[52 + 1];
/* Starting column */
*/
COMMAND_CODE show_equip(int target_item)
{
- int i, j, k, l;
+ COMMAND_CODE i;
+ int j, k, l;
int col, cur_col, len;
object_type *o_ptr;
char tmp_val[80];
char o_name[MAX_NLEN];
- int out_index[23];
+ COMMAND_CODE out_index[23];
byte out_color[23];
char out_desc[23][MAX_NLEN];
- int target_item_label = 0;
- int wid, hgt;
+ COMMAND_CODE target_item_label = 0;
+ TERM_POSITION wid, hgt;
char equip_label[52 + 1];
/* Starting column */
/* Extract "query" setting */
ver = isupper(which);
- which = tolower(which);
+ which = (char)tolower(which);
/* Convert letter to inventory index */
if (!command_wrk)
* mode & 0x02 -- Marked items only
* mode & 0x04 -- Stop after first
*/
-int scan_floor(int *items, int y, int x, int mode)
+int scan_floor(int *items, POSITION y, POSITION x, int mode)
{
int this_o_idx, next_o_idx;
* @param y 走査するフロアのY座標
* @param x 走査するフロアのX座標
* @param min_width 表示の長さ
- * @return 選択したアイテムのID
+ * @return 選択したアイテムの添え字
* @details
*/
-int show_floor(int target_item, int y, int x, int *min_width)
+COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_POSITION *min_width)
{
- int i, j, k, l;
+ COMMAND_CODE i;
+ int j, k, l;
int col, len;
object_type *o_ptr;
char tmp_val[80];
- int out_index[23];
+ COMMAND_CODE out_index[23];
byte out_color[23];
char out_desc[23][MAX_NLEN];
- int target_item_label = 0;
+ COMMAND_CODE target_item_label = 0;
int floor_list[23], floor_num;
int wid, hgt;
char out_val[160];
int floor_num, floor_list[23], floor_top = 0;
- int min_width = 0;
+ TERM_POSITION min_width = 0;
extern bool select_the_force;
*/
static bool py_pickup_floor_aux(void)
{
- s16b this_o_idx;
+ OBJECT_IDX this_o_idx;
cptr q, s;
- int item;
+ OBJECT_IDX item;
/* Restrict the choices */
item_tester_hook = inven_carry_okay;