if (item_tester_okay(&inventory[j]))
return TRUE;
- (void)scan_floor(floor_list, &floor_num, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x01);
if (floor_num)
return TRUE;
* mode & 0x02 -- Marked items only
* mode & 0x04 -- Stop after first
*/
-bool scan_floor(int *items, int *item_num, int y, int x, int mode)
+int scan_floor(int *items, int y, int x, int mode)
{
int this_o_idx, next_o_idx;
int num = 0;
- (*item_num) = 0;
-
/* Sanity */
- if (!in_bounds(y, x)) return (FALSE);
+ if (!in_bounds(y, x)) return 0;
/* Scan all objects in the grid */
for (this_o_idx = cave[y][x].o_idx; this_o_idx; this_o_idx = next_o_idx)
if ((mode & 0x02) && !o_ptr->marked) continue;
/* Accept this item */
- items[num++] = this_o_idx;
+ /* XXX Hack -- Enforce limit */
+ if (num <= 23)
+ items[num] = this_o_idx;
+
+ num++;
/* Only one */
if (mode & 0x04) break;
-
- /* XXX Hack -- Enforce limit */
- if (num == 23) break;
}
- /* Number of items */
- (*item_num) = num;
-
/* Result */
- return (num != 0);
+ return num;
}
/*
* Display a list of the items on the floor at the given location.
*/
-int show_floor(int target_item, int y, int x)
+int show_floor(int target_item, int y, int x, int *min_width)
{
int i, j, k, l;
int col, len, lim;
Term_get_size(&wid, &hgt);
/* Default length */
- len = 20;
+ len = MAX((*min_width), 20);
/* Maximum space allowed for descriptions */
lim = wid - 4;
if (show_weights) lim -= 9;
/* Scan for objects in the grid, using item_tester_okay() */
- (void) scan_floor(floor_list, &floor_num, y, x, 0x01);
+ floor_num = scan_floor(floor_list, y, x, 0x01);
/* Display the inventory */
- for (k = 0, i = 0; i < floor_num; i++)
+ for (k = 0, i = 0; i < floor_num && i < 23; i++)
{
o_ptr = &o_list[floor_list[i]];
k++;
}
+ /* Save width */
+ *min_width = len;
+
/* Find the column to start in */
col = (len > wid - 4) ? 0 : (wid - len - 1);
char out_val[160];
int floor_num, floor_list[23], floor_top = 0;
+ int min_width = 0;
extern bool select_spellbook;
extern bool select_the_force;
if (floor)
{
/* Scan all objects in the grid */
- (void) scan_floor(floor_list, &floor_num, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x01);
}
/* Accept inventory */
n2 = I2A(k - floor_top);
/* Redraw if needed */
- if (command_see) get_item_label = show_floor(menu_line, py, px);
+ if (command_see) get_item_label = show_floor(menu_line, py, px, &min_width);
}
/* Viewing inventory */
if (command_see && !use_menu)
{
#ifdef JP
- strcat(out_val, " RET ¼¡,");
+ strcat(out_val, " Enter ¼¡,");
#else
strcat(out_val, " Enter for scroll down,");
#endif
int max_line = 1;
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
switch (which)
{
case ESCAPE:
/* Switch inven/equip */
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
if (menu_line > max_line) menu_line = max_line;
/* Need to redraw */
/* Switch inven/equip */
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
if (menu_line > max_line) menu_line = max_line;
/* Need to redraw */
o_list[i].next_o_idx = o_idx;
/* Re-scan floor list */
- scan_floor(floor_list, &floor_num, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x01);
/* Hack -- Fix screen */
if (command_see)
else if (command_wrk == USE_FLOOR)
{
k = islower(which) ? A2I(which) : -1;
- if (k < 0 || k >= floor_num)
+ if (k < 0 || k >= floor_num || k >= 23)
{
bell();
break;
}
/* Remember this object index */
- floor_list[floor_num] = this_o_idx;
+ if (floor_num <= 23)
+ floor_list[floor_num] = this_o_idx;
/* Count non-gold objects */
floor_num++;
- if (floor_num == 23) break;
-
/* Remember this index */
floor_o_idx = this_o_idx;
}
if (easy_floor)
{
int floor_list[23], floor_num;
+ int min_width = 0;
- if (scan_floor(floor_list, &floor_num, y, x, 0x02))
+ floor_num = scan_floor(floor_list, y, x, 0x02);
+
+ if (floor_num)
{
/* Not boring */
boring = FALSE;
query = inkey();
/* Display list of items (query == "el", not "won") */
- if ((floor_num > 1) && (query == 'x'))
+ if (floor_num == 1 || query != 'x')
+ {
+ /* Stop */
+ break;
+ }
+ else while (1)
{
+ int i, o_idx;
+ cave_type *c_ptr;
+
/* Save screen */
screen_save();
/* Display */
- (void)show_floor(0, y, x);
+ (void)show_floor(0, y, x, &min_width);
/* Prompt */
#ifdef JP
-prt("²¿¤«¥¡¼¤ò²¡¤¹¤È¥²¡¼¥à¤ËÌá¤ê¤Þ¤¹", 0, 0);
+ prt("Enter¤Ç¼¡¤Ø¡¢Â¾¤Î¥¡¼¤ò²¡¤¹¤È¥²¡¼¥à¤ËÌá¤ê¤Þ¤¹", 0, 0);
#else
- prt("Hit any key to continue", 0, 0);
+ prt("Hit Enter to scroll, Hit any other key to continue", 0, 0);
#endif
-
/* Wait */
- (void) inkey();
+ query = inkey();
/* Load screen */
screen_load();
- }
- else
- {
- /* Stop */
- break;
+
+ /* Exit unless 'Enter' */
+ if (query != '\n' && query != '\r') break;
+
+ /* Get the object being moved. */
+ c_ptr = &cave[y][x];
+ o_idx = c_ptr->o_idx;
+
+ /* Only rotate a pile of two or more objects. */
+ if (o_idx && o_list[o_idx].next_o_idx)
+ {
+
+ /* Remove the first object from the list. */
+ excise_object_idx(o_idx);
+
+ /* Find end of the list. */
+ i = c_ptr->o_idx;
+ while (o_list[i].next_o_idx)
+ i = o_list[i].next_o_idx;
+
+ /* Add after the last object. */
+ o_list[i].next_o_idx = o_idx;
+ }
}
}