* flag. This is useful for switching "graphics" on/off.\n
*\n
* The features, objects, and monsters, should all be encoded in the\n
- * relevant "font.pref" and/or "graf.prf" files. XXX XXX XXX\n
+ * relevant "font.pref" and/or "graf.prf" files. \n
*\n
- * The "prefs" parameter is no longer meaningful. XXX XXX XXX\n
+ * The "prefs" parameter is no longer meaningful. \n
*/
void reset_visuals(void)
{
* @param flgs フラグ情報を受け取る配列
* @return なし
*/
-void object_flags(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
+void object_flags(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE])
{
object_kind *k_ptr = &k_info[o_ptr->k_idx];
int i;
* @param flgs フラグ情報を受け取る配列
* @return なし
*/
-void object_flags_known(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE])
+void object_flags_known(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE])
{
bool spoil = FALSE;
int i;
static cptr item_activation_dragon_breath(object_type *o_ptr)
{
static char desc[256];
- u32b flgs[TR_FLAG_SIZE]; /* for resistance flags */
+ BIT_FLAGS flgs[TR_FLAG_SIZE]; /* for resistance flags */
int i, n = 0;
object_flags(o_ptr, flgs);
*/
cptr item_activation(object_type *o_ptr)
{
- u32b flgs[TR_FLAG_SIZE];
+ BIT_FLAGS flgs[TR_FLAG_SIZE];
/* Extract the flags */
object_flags(o_ptr, flgs);
return _("モンスターを捕える、又は解放する。", "captures or releases a monster.");
}
- /* Oops */
return _("何も起きない", "Nothing");
}
{
int i = 0, j, k;
- u32b flgs[TR_FLAG_SIZE];
+ BIT_FLAGS flgs[TR_FLAG_SIZE];
char temp[70 * 20];
cptr info[128];
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
int wid, hgt;
POSITION rad;
char desc[256];
/* No relevant informations */
if (i <= trivial_info) return (FALSE);
-
- /* Save the screen */
screen_save();
- /* Get size */
Term_get_size(&wid, &hgt);
/* Display Item name */
prt(_("[何かキーを押すとゲームに戻ります]", "[Press any key to continue]"), k, 15);
inkey();
-
- /* Restore the screen */
screen_load();
/* Gave knowledge */
case INVEN_LARM: p = p_ptr->heavy_wield[1] ? "Just lifting" : (p_ptr->hidarite ? "Wielding" : "On arm"); break;
#endif
-#ifdef JP
- case INVEN_BOW: p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? "運搬中" : "射撃用"; break;
-#else
- case INVEN_BOW: p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? "Just holding" : "Shooting"; break;
-#endif
-
-#ifdef JP
- case INVEN_RIGHT: p = (left_hander ? "左手指" : "右手指"); break;
-#else
- case INVEN_RIGHT: p = (left_hander ? "On left hand" : "On right hand"); break;
-#endif
-
-#ifdef JP
- case INVEN_LEFT: p = (left_hander ? "右手指" : "左手指"); break;
-#else
- case INVEN_LEFT: p = (left_hander ? "On right hand" : "On left hand"); break;
-#endif
-
+ case INVEN_BOW: p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? _("運搬中", "Just holding") : _("射撃用", "Shooting"); break;
+ case INVEN_RIGHT: p = (left_hander ? _("左手指", "On left hand") : _("右手指", "On right hand")); break;
+ case INVEN_LEFT: p = (left_hander ? _("右手指", "On right hand") : _("左手指", "On left hand")); break;
case INVEN_NECK: p = _(" 首", "Around neck"); break;
case INVEN_LITE: p = _(" 光源", "Light source"); break;
case INVEN_BODY: p = _(" 体", "On body"); break;
case INVEN_LARM: p = p_ptr->heavy_wield[1] ? "just lifting" : (p_ptr->hidarite ? "attacking monsters with" : "wearing on your arm"); break;
#endif
-#ifdef JP
- case INVEN_BOW: p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? "持つだけで精一杯の" : "射撃用に装備している"; break;
-#else
- case INVEN_BOW: p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? "just holding" : "shooting missiles with"; break;
-#endif
-
-#ifdef JP
- case INVEN_RIGHT: p = (left_hander ? "左手の指にはめている" : "右手の指にはめている"); break;
-#else
- case INVEN_RIGHT: p = (left_hander ? "wearing on your left hand" : "wearing on your right hand"); break;
-#endif
-
-#ifdef JP
- case INVEN_LEFT: p = (left_hander ? "右手の指にはめている" : "左手の指にはめている"); break;
-#else
- case INVEN_LEFT: p = (left_hander ? "wearing on your right hand" : "wearing on your left hand"); break;
-#endif
-
+ case INVEN_BOW: p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < inventory[i].weight / 10) ? _("持つだけで精一杯の", "just holding") : _("射撃用に装備している", "shooting missiles with"); break;
+ case INVEN_RIGHT: p = (left_hander ? _("左手の指にはめている", "wearing on your left hand") : _("右手の指にはめている", "wearing on your right hand")); break;
+ case INVEN_LEFT: p = (left_hander ? _("右手の指にはめている", "wearing on your right hand") : _("左手の指にはめている", "wearing on your left hand")); break;
case INVEN_NECK: p = _("首にかけている", "wearing around your neck"); break;
case INVEN_LITE: p = _("光源にしている", "using to light the way"); break;
case INVEN_BODY: p = _("体に着ている", "wearing on your body"); break;
bool item_tester_okay(object_type *o_ptr)
{
/* Hack -- allow listing empty slots */
- if (item_tester_full) return (TRUE);
+ // if (item_tester_full) return (TRUE); // TODO:DELETE
/* Require an item */
if (!o_ptr->k_idx) return (FALSE);
*/
void display_inven(void)
{
- register int i, n, z = 0;
- object_type *o_ptr;
- byte attr = TERM_WHITE;
- char tmp_val[80];
- char o_name[MAX_NLEN];
- int wid, hgt;
+ register int i, n, z = 0;
+ object_type *o_ptr;
+ TERM_COLOR attr = TERM_WHITE;
+ char tmp_val[80];
+ GAME_TEXT o_name[MAX_NLEN];
+ TERM_LEN wid, hgt;
- /* Get size */
Term_get_size(&wid, &hgt);
/* Find the "final" slot */
{
int wgt = o_ptr->weight * o_ptr->number;
#ifdef JP
- sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt),lbtokg2(wgt) );
+ sprintf(tmp_val, "%3d.%1d kg", lbtokg1(wgt), lbtokg2(wgt));
#else
sprintf(tmp_val, "%3d.%1d lb", wgt / 10, wgt % 10);
#endif
*/
void display_equip(void)
{
- register int i, n;
- object_type *o_ptr;
- byte attr = TERM_WHITE;
- char tmp_val[80];
- char o_name[MAX_NLEN];
- int wid, hgt;
+ register int i, n;
+ object_type *o_ptr;
+ TERM_COLOR attr = TERM_WHITE;
+ char tmp_val[80];
+ GAME_TEXT o_name[MAX_NLEN];
+ TERM_LEN wid, hgt;
- /* Get size */
Term_get_size(&wid, &hgt);
- /* Display the equipment */
for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
{
/* Examine the item */
if (!o_ptr->inscription) continue;
/* Skip non-choice */
- if (!item_tester_okay(o_ptr)) continue;
+ if (!item_tester_okay(o_ptr) && !(mode & USE_FULL)) continue;
/* Find a '@' */
s = my_strchr(quark_str(o_ptr->inscription), '@');
if (!o_ptr->inscription) continue;
/* Skip non-choice */
- if (!item_tester_okay(o_ptr)) continue;
+ if (!item_tester_okay(o_ptr) && !(mode & USE_FULL)) continue;
/* Find a '@' */
s = my_strchr(quark_str(o_ptr->inscription), '@');
* @details
* Hack -- do not display "trailing" empty slots
*/
-COMMAND_CODE show_inven(int target_item)
+COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode)
{
COMMAND_CODE i;
int j, k, l, z = 0;
int col, cur_col, len;
object_type *o_ptr;
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
char tmp_val[80];
- COMMAND_CODE out_index[23];
- byte out_color[23];
+ COMMAND_CODE out_index[23];
+ TERM_COLOR out_color[23];
char out_desc[23][MAX_NLEN];
COMMAND_CODE target_item_label = 0;
TERM_LEN wid, hgt;
- char inven_label[52 + 1];
+ char inven_label[52 + 1];
/* Starting column */
col = command_gap;
- /* Get size */
Term_get_size(&wid, &hgt);
/* Default "max-length" */
o_ptr = &inventory[i];
/* Is this item acceptable? */
- if (!item_tester_okay(o_ptr)) continue;
+ if (!item_tester_okay(o_ptr) && !(mode & USE_FULL)) continue;
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
/* Save the object index, color, and description */
/* Get the index */
i = out_index[j];
- /* Get the item */
o_ptr = &inventory[i];
/* Clear the line */
* @param target_item アイテムの選択処理を行うか否か。
* @return 選択したアイテムのタグ
*/
-COMMAND_CODE show_equip(int target_item)
+COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode)
{
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];
- COMMAND_CODE out_index[23];
- byte out_color[23];
+ GAME_TEXT o_name[MAX_NLEN];
+ COMMAND_CODE out_index[23];
+ TERM_COLOR out_color[23];
char out_desc[23][MAX_NLEN];
COMMAND_CODE target_item_label = 0;
TERM_LEN wid, hgt;
/* Starting column */
col = command_gap;
- /* Get size */
Term_get_size(&wid, &hgt);
/* Maximal length */
o_ptr = &inventory[i];
/* Is this item acceptable? */
- if (!(select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr)) &&
+ if (!(select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr) || (mode & USE_FULL)) &&
(!((((i == INVEN_RARM) && p_ptr->hidarite) || ((i == INVEN_LARM) && p_ptr->migite)) && p_ptr->ryoute) ||
- item_tester_no_ryoute)) continue;
+ (mode & IGNORE_BOTHHAND_SLOT))) continue;
/* Description */
object_desc(o_name, o_ptr, 0);
if ((((i == INVEN_RARM) && p_ptr->hidarite) || ((i == INVEN_LARM) && p_ptr->migite)) && p_ptr->ryoute)
{
-#ifdef JP
- (void)strcpy(out_desc[k],"(武器を両手持ち)");
-#else
- (void)strcpy(out_desc[k],"(wielding with two-hands)");
-#endif
+ (void)strcpy(out_desc[k],_("(武器を両手持ち)", "(wielding with two-hands)"));
out_color[k] = TERM_WHITE;
}
else
/* Get the index */
i = out_index[j];
- /* Get the item */
o_ptr = &inventory[i];
/* Clear the line */
window_flag[j] &= ~(PW_INVEN);
window_flag[j] |= (PW_EQUIP);
- /* Window stuff */
p_ptr->window |= (PW_EQUIP);
}
window_flag[j] &= ~(PW_EQUIP);
window_flag[j] |= (PW_INVEN);
- /* Window stuff */
p_ptr->window |= (PW_INVEN);
}
}
*/
static bool verify(cptr prompt, INVENTORY_IDX item)
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
char out_val[MAX_NLEN+20];
object_type *o_ptr;
{
o_ptr = &o_list[0 - item];
}
-
- /* Describe */
object_desc(o_name, o_ptr, 0);
/* Prompt */
static bool get_item_allow(INVENTORY_IDX item)
{
cptr s;
-
object_type *o_ptr;
-
if (!command_cmd) return TRUE; /* command_cmd is no longer effective */
/* Inventory */
char tmp_val[160];
char out_val[160];
- /* See cmd5.c */
- extern bool select_the_force;
-
int menu_line = (use_menu ? 1 : 0);
int max_inven = 0;
int max_equip = 0;
-#ifdef ALLOW_REPEAT
-
static char prev_tag = '\0';
char cur_tag = '\0';
-#endif /* ALLOW_REPEAT */
-
-#ifdef ALLOW_EASY_FLOOR /* TNB */
-
if (easy_floor || use_menu) return get_item_floor(cp, pmt, str, mode);
-#endif /* ALLOW_EASY_FLOOR -- TNB */
-
/* Extract args */
if (mode & USE_EQUIP) equip = TRUE;
if (mode & USE_INVEN) inven = TRUE;
if (mode & USE_FLOOR) floor = TRUE;
-#ifdef ALLOW_REPEAT
-
/* Get the item index */
if (repeat_pull(cp))
{
/* the_force */
- if (select_the_force && (*cp == INVEN_FORCE))
+ if (mode & USE_FORCE && (*cp == INVEN_FORCE))
{
item_tester_tval = 0;
item_tester_hook = NULL;
/* Special index */
k = 0 - (*cp);
-
- /* Acquire object */
o_ptr = &o_list[k];
/* Validate the item */
- if (item_tester_okay(o_ptr))
+ if (item_tester_okay(o_ptr) || (mode & USE_FULL))
{
/* Forget restrictions */
item_tester_tval = 0;
}
}
-#endif /* ALLOW_REPEAT */
-
-
- /* Paranoia XXX XXX XXX */
+ /* Paranoia */
msg_print(NULL);
-
/* Not done */
done = FALSE;
else if (use_menu)
{
for (j = 0; j < INVEN_PACK; j++)
- if (item_tester_okay(&inventory[j])) max_inven++;
+ if (item_tester_okay(&inventory[j]) || (mode & USE_FULL)) max_inven++;
}
/* Restrict inventory indexes */
else if (use_menu)
{
for (j = INVEN_RARM; j < INVEN_TOTAL; j++)
- if (select_ring_slot ? is_ring_slot(j) : item_tester_okay(&inventory[j])) max_equip++;
- if (p_ptr->ryoute && !item_tester_no_ryoute) max_equip++;
+ if (select_ring_slot ? is_ring_slot(j) : item_tester_okay(&inventory[j]) || (mode & USE_FULL)) max_equip++;
+ if (p_ptr->ryoute && !(mode & IGNORE_BOTHHAND_SLOT)) max_equip++;
}
/* Restrict equipment indexes */
while ((e1 <= e2) && (!get_item_okay(e1))) e1++;
while ((e1 <= e2) && (!get_item_okay(e2))) e2--;
- if (equip && p_ptr->ryoute && !item_tester_no_ryoute)
+ if (equip && p_ptr->ryoute && !(mode & IGNORE_BOTHHAND_SLOT))
{
if (p_ptr->migite)
{
for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
-
- /* Acquire object */
o_ptr = &o_list[this_o_idx];
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
/* Accept the item on the floor if legal */
- if (item_tester_okay(o_ptr) && (o_ptr->marked & OM_FOUND)) allow_floor = TRUE;
+ if ((item_tester_okay(o_ptr) || (mode & USE_FULL)) && (o_ptr->marked & OM_FOUND)) allow_floor = TRUE;
}
}
{
/* Cancel p_ptr->command_see */
command_see = FALSE;
-
- /* Oops */
oops = TRUE;
-
- /* Done */
done = TRUE;
- if (select_the_force) {
+ if (mode & USE_FORCE) {
*cp = INVEN_FORCE;
item = TRUE;
}
/* Hack -- start out in "display" mode */
if (command_see)
{
- /* Save screen */
screen_save();
}
}
/* Toggle if needed */
- if ((command_wrk && ni && !ne) ||
- (!command_wrk && !ni && ne))
+ if ((command_wrk && ni && !ne) || (!command_wrk && !ni && ne))
{
/* Toggle */
toggle_inven_equip();
toggle = !toggle;
}
- /* Update */
p_ptr->window |= (PW_INVEN | PW_EQUIP);
-
- /* Redraw windows */
- window_stuff();
-
+ handle_stuff();
/* Inventory screen */
if (!command_wrk)
{
/* Redraw if needed */
- if (command_see) get_item_label = show_inven(menu_line);
+ if (command_see) get_item_label = show_inven(menu_line, mode);
}
/* Equipment screen */
else
{
/* Redraw if needed */
- if (command_see) get_item_label = show_equip(menu_line);
+ if (command_see) get_item_label = show_equip(menu_line, mode);
}
/* Viewing inventory */
if (!command_see && !use_menu) strcat(out_val, _(" '*'一覧,", " * to see,"));
/* Append */
-#ifdef JP
- if (equip) strcat(out_val, format(" %s 装備品,", use_menu ? "'4'or'6'" : "'/'"));
-#else
- if (equip) strcat(out_val, format(" %s for Equip,", use_menu ? "4 or 6" : "/"));
-#endif
+ if (equip) strcat(out_val, format(_(" %s 装備品,", " %s for Equip,"), use_menu ? _("'4'or'6'", "4 or 6") : _("'/'", "/")));
}
/* Viewing equipment */
if (!command_see && !use_menu) strcat(out_val, _(" '*'一覧,", " * to see,"));
/* Append */
-#ifdef JP
- if (inven) strcat(out_val, format(" %s 持ち物,", use_menu ? "'4'or'6'" : "'/'"));
-#else
- if (inven) strcat(out_val, format(" %s for Inven,", use_menu ? "4 or 6" : "'/'"));
-#endif
+ if (inven) strcat(out_val, format(_(" %s 持ち物,", " %s for Inven,"), use_menu ? _("'4'or'6'", "4 or 6") : _("'/'", "'/'")));
}
/* Indicate legality of the "floor" item */
if (allow_floor) strcat(out_val, _(" '-'床上,", " - for floor,"));
- if (select_the_force) strcat(out_val, _(" 'w'練気術,", " w for the Force,"));
+ if (mode & USE_FORCE) strcat(out_val, _(" 'w'練気術,", " w for the Force,"));
/* Finish the prompt */
strcat(out_val, " ESC");
/* Hack -- Fix screen */
if (command_see)
{
- /* Load screen */
screen_load();
-
- /* Save screen */
screen_save();
}
}
case 'w':
{
- if (select_the_force) {
+ if (mode & USE_FORCE) {
*cp = INVEN_FORCE;
item = TRUE;
done = TRUE;
{
/* Flip flag */
command_see = FALSE;
-
- /* Load screen */
screen_load();
}
/* Show the list */
else
{
- /* Save screen */
screen_save();
/* Flip flag */
/* Hack -- Fix screen */
if (command_see)
{
- /* Load screen */
screen_load();
-
- /* Save screen */
screen_save();
}
for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
-
- /* Acquire object */
o_ptr = &o_list[this_o_idx];
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
/* Validate the item */
- if (!item_tester_okay(o_ptr)) continue;
+ if (!item_tester_okay(o_ptr) && !(mode & USE_FULL)) continue;
/* Special index */
k = 0 - this_o_idx;
if (done) break;
}
- /* Oops */
bell();
break;
}
(*cp) = k;
item = TRUE;
done = TRUE;
-#ifdef ALLOW_REPEAT
cur_tag = which;
-#endif /* ALLOW_REPEAT */
break;
}
case 'w':
{
- if (select_the_force) {
+ if (mode & USE_FORCE) {
*cp = INVEN_FORCE;
item = TRUE;
done = TRUE;
(*cp) = k;
item = TRUE;
done = TRUE;
-#ifdef ALLOW_REPEAT
cur_tag = which;
-#endif /* ALLOW_REPEAT */
break;
}
/* Fix the screen if necessary */
if (command_see)
{
- /* Load screen */
screen_load();
/* Hack -- Cancel "display" */
/* Forget the item_tester_tval restriction */
item_tester_tval = 0;
- item_tester_no_ryoute = FALSE;
-
/* Forget the item_tester_hook restriction */
item_tester_hook = NULL;
/* Toggle again if needed */
if (toggle) toggle_inven_equip();
- /* Update */
p_ptr->window |= (PW_INVEN | PW_EQUIP);
-
- /* Window stuff */
- window_stuff();
-
+ handle_stuff();
/* Clear the prompt line */
prt("", 0, 0);
if (item)
{
-#ifdef ALLOW_REPEAT
repeat_push(*cp);
if (command_cmd) prev_tag = cur_tag;
-#endif /* ALLOW_REPEAT */
-
command_cmd = 0; /* Hack -- command_cmd is no longer effective */
}
-
- /* Result */
return (item);
}
+/*
+ * Choose an item and get auto-picker entry from it.
+ */
+object_type *choose_object(OBJECT_IDX *idx, cptr q, cptr s, BIT_FLAGS option)
+{
+ OBJECT_IDX item;
+ if (!get_item(&item, q, s, option)) return NULL;
+ if (idx) *idx = item;
+
+ if (item == INVEN_FORCE) return NULL;
+
+ /* Get the item (in the pack) */
+ else if (item >= 0) return &inventory[item];
+
+ /* Get the item (on the floor) */
+ else return &o_list[0 - item];
+}
-#ifdef ALLOW_EASY_FLOOR
/*!
* @brief 床下に落ちているオブジェクトの数を返す / scan_floor
for (this_o_idx = cave[y][x].o_idx; this_o_idx; this_o_idx = next_o_idx)
{
object_type *o_ptr;
-
- /* Acquire object */
o_ptr = &o_list[this_o_idx];
/* Acquire next object */
/* Only one */
if (mode & 0x04) break;
}
-
- /* Result */
return num;
}
object_type *o_ptr;
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
char tmp_val[80];
COMMAND_CODE out_index[23];
- byte out_color[23];
+ TERM_COLOR out_color[23];
char out_desc[23][MAX_NLEN];
COMMAND_CODE target_item_label = 0;
bool dont_need_to_show_weights = TRUE;
- /* Get size */
Term_get_size(&wid, &hgt);
/* Default length */
len = MAX((*min_width), 20);
-
/* Scan for objects in the grid, using item_tester_okay() */
floor_num = scan_floor(floor_list, y, x, 0x03);
{
o_ptr = &o_list[floor_list[i]];
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
/* Save the index */
/* Get the index */
m = floor_list[out_index[j]];
- /* Get the item */
o_ptr = &o_list[m];
/* Clear the line */
bool equip = (mode & USE_EQUIP) ? TRUE : FALSE;
bool inven = (mode & USE_INVEN) ? TRUE : FALSE;
bool floor = (mode & USE_FLOOR) ? TRUE : FALSE;
+ bool force = (mode & USE_FORCE) ? TRUE : FALSE;
bool allow_equip = FALSE;
bool allow_inven = FALSE;
int floor_top = 0;
TERM_LEN min_width = 0;
- extern bool select_the_force;
-
int menu_line = (use_menu ? 1 : 0);
int max_inven = 0;
int max_equip = 0;
-#ifdef ALLOW_REPEAT
-
static char prev_tag = '\0';
char cur_tag = '\0';
if (repeat_pull(cp))
{
/* the_force */
- if (select_the_force && (*cp == INVEN_FORCE))
+ if (force && (*cp == INVEN_FORCE))
{
item_tester_tval = 0;
item_tester_hook = NULL;
}
/* Validate the item */
- else if (item_tester_okay(&o_list[0 - (*cp)]))
+ else if (item_tester_okay(&o_list[0 - (*cp)]) || (mode & USE_FULL))
{
/* Forget restrictions */
item_tester_tval = 0;
}
}
-#endif /* ALLOW_REPEAT */
-
- /* Paranoia XXX XXX XXX */
+ /* Paranoia */
msg_print(NULL);
else if (use_menu)
{
for (j = 0; j < INVEN_PACK; j++)
- if (item_tester_okay(&inventory[j])) max_inven++;
+ if (item_tester_okay(&inventory[j]) || (mode & USE_FULL)) max_inven++;
}
/* Restrict inventory indexes */
else if (use_menu)
{
for (j = INVEN_RARM; j < INVEN_TOTAL; j++)
- if (select_ring_slot ? is_ring_slot(j) : item_tester_okay(&inventory[j])) max_equip++;
- if (p_ptr->ryoute && !item_tester_no_ryoute) max_equip++;
+ if (select_ring_slot ? is_ring_slot(j) : item_tester_okay(&inventory[j]) || (mode & USE_FULL)) max_equip++;
+ if (p_ptr->ryoute && !(mode & IGNORE_BOTHHAND_SLOT)) max_equip++;
}
/* Restrict equipment indexes */
while ((e1 <= e2) && (!get_item_okay(e1))) e1++;
while ((e1 <= e2) && (!get_item_okay(e2))) e2--;
- if (equip && p_ptr->ryoute && !item_tester_no_ryoute)
+ if (equip && p_ptr->ryoute && !(mode & IGNORE_BOTHHAND_SLOT))
{
if (p_ptr->migite)
{
{
/* Cancel p_ptr->command_see */
command_see = FALSE;
-
- /* Oops */
oops = TRUE;
-
- /* Done */
done = TRUE;
- if (select_the_force) {
+ if (force) {
*cp = INVEN_FORCE;
item = TRUE;
}
/* Hack -- start out in "display" mode */
if (command_see)
{
- /* Save screen */
screen_save();
}
toggle = !toggle;
}
- /* Update */
p_ptr->window |= (PW_INVEN | PW_EQUIP);
-
- /* Redraw windows */
- window_stuff();
+ handle_stuff();
/* Inventory screen */
if (command_wrk == (USE_INVEN))
n2 = I2A(i2);
/* Redraw if needed */
- if (command_see) get_item_label = show_inven(menu_line);
+ if (command_see) get_item_label = show_inven(menu_line, mode);
}
/* Equipment screen */
n2 = I2A(e2 - INVEN_RARM);
/* Redraw if needed */
- if (command_see) get_item_label = show_equip(menu_line);
+ if (command_see) get_item_label = show_equip(menu_line, mode);
}
/* Floor screen */
/* Append */
if (allow_equip)
{
-#ifdef JP
- if (!use_menu)
- strcat(out_val, " '/' 装備品,");
- else if (allow_floor)
- strcat(out_val, " '6' 装備品,");
- else
- strcat(out_val, " '4'or'6' 装備品,");
-#else
if (!use_menu)
- strcat(out_val, " / for Equip,");
+ strcat(out_val, _(" '/' 装備品,", " / for Equip,"));
else if (allow_floor)
- strcat(out_val, " 6 for Equip,");
+ strcat(out_val, _(" '6' 装備品,", " 6 for Equip,"));
else
- strcat(out_val, " 4 or 6 for Equip,");
-#endif
+ strcat(out_val, _(" '4'or'6' 装備品,", " 4 or 6 for Equip,"));
}
/* Append */
if (allow_floor)
{
-#ifdef JP
- if (!use_menu)
- strcat(out_val, " '-'床上,");
- else if (allow_equip)
- strcat(out_val, " '4' 床上,");
- else
- strcat(out_val, " '4'or'6' 床上,");
-#else
if (!use_menu)
- strcat(out_val, " - for floor,");
+ strcat(out_val, _(" '-'床上,", " - for floor,"));
else if (allow_equip)
- strcat(out_val, " 4 for floor,");
+ strcat(out_val, _(" '4' 床上,", " 4 for floor,"));
else
- strcat(out_val, " 4 or 6 for floor,");
-#endif
+ strcat(out_val, _(" '4'or'6' 床上,", " 4 or 6 for floor,"));
}
}
/* Append */
if (allow_inven)
{
-#ifdef JP
- if (!use_menu)
- strcat(out_val, " '/' 持ち物,");
- else if (allow_floor)
- strcat(out_val, " '4' 持ち物,");
- else
- strcat(out_val, " '4'or'6' 持ち物,");
-#else
if (!use_menu)
- strcat(out_val, " / for Inven,");
+ strcat(out_val, _(" '/' 持ち物,", " / for Inven,"));
else if (allow_floor)
- strcat(out_val, " 4 for Inven,");
+ strcat(out_val, _(" '4' 持ち物,", " 4 for Inven,"));
else
- strcat(out_val, " 4 or 6 for Inven,");
-#endif
+ strcat(out_val, _(" '4'or'6' 持ち物,", " 4 or 6 for Inven,"));
}
/* Append */
if (allow_floor)
{
-#ifdef JP
- if (!use_menu)
- strcat(out_val, " '-'床上,");
- else if (allow_inven)
- strcat(out_val, " '6' 床上,");
- else
- strcat(out_val, " '4'or'6' 床上,");
-#else
if (!use_menu)
- strcat(out_val, " - for floor,");
+ strcat(out_val, _(" '-'床上,", " - for floor,"));
else if (allow_inven)
- strcat(out_val, " 6 for floor,");
+ strcat(out_val, _(" '6' 床上,", " 6 for floor,"));
else
- strcat(out_val, " 4 or 6 for floor,");
-#endif
+ strcat(out_val, _(" '4'or'6' 床上,", " 4 or 6 for floor,"));
}
}
}
/* Append */
- if (select_the_force) strcat(out_val, _(" 'w'練気術,", " w for the Force,"));
+ if (force) strcat(out_val, _(" 'w'練気術,", " w for the Force,"));
/* Finish the prompt */
strcat(out_val, " ESC");
/* Hack -- Fix screen */
if (command_see)
{
- /* Load screen */
screen_load();
-
- /* Save screen */
screen_save();
}
/* Hack -- Fix screen */
if (command_see)
{
- /* Load screen */
screen_load();
-
- /* Save screen */
screen_save();
}
}
case 'w':
{
- if (select_the_force) {
+ if (force) {
*cp = INVEN_FORCE;
item = TRUE;
done = TRUE;
{
/* Flip flag */
command_see = FALSE;
-
- /* Load screen */
screen_load();
}
/* Show the list */
else
{
- /* Save screen */
screen_save();
/* Flip flag */
case '+':
{
int i;
- IDX o_idx;
+ OBJECT_IDX o_idx;
cave_type *c_ptr = &cave[p_ptr->y][p_ptr->x];
if (command_wrk != (USE_FLOOR)) break;
/* Hack -- Fix screen */
if (command_see)
{
- /* Load screen */
screen_load();
-
- /* Save screen */
screen_save();
}
/* Hack -- Fix screen */
if (command_see)
{
- /* Load screen */
screen_load();
-
- /* Save screen */
screen_save();
}
/* Hack -- Fix screen */
if (command_see)
{
- /* Load screen */
screen_load();
-
- /* Save screen */
screen_save();
}
(*cp) = k;
item = TRUE;
done = TRUE;
-#ifdef ALLOW_REPEAT
cur_tag = which;
-#endif /* ALLOW_REPEAT */
break;
}
case 'w':
{
- if (select_the_force) {
+ if (force) {
*cp = INVEN_FORCE;
item = TRUE;
done = TRUE;
(*cp) = k;
item = TRUE;
done = TRUE;
-#ifdef ALLOW_REPEAT
cur_tag = which;
-#endif /* ALLOW_REPEAT */
break;
}
}
(*cp) = k;
item = TRUE;
done = TRUE;
-#ifdef ALLOW_REPEAT
cur_tag = which;
-#endif /* ALLOW_REPEAT */
break;
}
}
/* Fix the screen if necessary */
if (command_see)
{
- /* Load screen */
screen_load();
/* Hack -- Cancel "display" */
/* Toggle again if needed */
if (toggle) toggle_inven_equip();
- /* Update */
p_ptr->window |= (PW_INVEN | PW_EQUIP);
-
- /* Window stuff */
- window_stuff();
-
+ handle_stuff();
/* Clear the prompt line */
prt("", 0, 0);
if (item)
{
-#ifdef ALLOW_REPEAT
repeat_push(*cp);
if (command_cmd) prev_tag = cur_tag;
-#endif /* ALLOW_REPEAT */
-
command_cmd = 0; /* Hack -- command_cmd is no longer effective */
}
-
- /* Result */
return (item);
}
static bool py_pickup_floor_aux(void)
{
OBJECT_IDX this_o_idx;
-
cptr q, s;
-
OBJECT_IDX item;
/* Restrict the choices */
{
OBJECT_IDX this_o_idx, next_o_idx = 0;
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_type *o_ptr;
int floor_num = 0;
/* Access the object */
o_ptr = &o_list[this_o_idx];
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
/* Access the next object */
next_o_idx = o_ptr->next_o_idx;
/* Hack -- disturb */
- disturb(0, 0);
+ disturb(FALSE, FALSE);
/* Pick up gold */
if (o_ptr->tval == TV_GOLD)
{
- /* Message */
#ifdef JP
msg_format(" $%ld の価値がある%sを見つけた。",
(long)o_ptr->pval, o_name);
/* Redraw gold */
p_ptr->redraw |= (PR_GOLD);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER);
/* Delete the gold */
#endif /* ALLOW_EASY_SENSE */
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
- /* Message */
msg_format(_("%sがある。", "You see %s."), o_name);
}
/* Multiple objects */
else
{
- /* Message */
msg_format(_("%d 個のアイテムの山がある。", "You see a pile of %d items."), floor_num);
}
- /* Done */
return;
}
#endif /* ALLOW_EASY_SENSE */
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
- /* Message */
msg_format(_("ザックには%sを入れる隙間がない。", "You have no room for %s."), o_name);
}
/* Multiple objects */
else
{
- /* Message */
msg_print(_("ザックには床にあるどのアイテムも入らない。", "You have no room for any of the objects on the floor."));
}
- /* Done */
return;
}
#endif /* ALLOW_EASY_SENSE */
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
/* Build a prompt */
/* Ask the user to confirm */
if (!get_check(out_val))
{
- /* Done */
return;
}
}
}
}
}
-
-#endif /* ALLOW_EASY_FLOOR */
OSDN Git Service
