* @return 対応するID。該当スロットにオブジェクトが存在しなかった場合-1を返す / Return "-1" if the label does not indicate a real item
* @details Note that the label does NOT distinguish inven/equip.
*/
-s16b label_to_inven(int c)
+INVENTORY_IDX label_to_inven(int c)
{
- int i;
+ INVENTORY_IDX i;
/* Convert */
- i = (islower(c) ? A2I(c) : -1);
+ i = (INVENTORY_IDX)(islower(c) ? A2I(c) : -1);
/* Verify the index */
if ((i < 0) || (i > INVEN_PACK)) return (-1);
* Convert a label into the index of a item in the "equip"
* @return 対応するID。該当スロットにオブジェクトが存在しなかった場合-1を返す / Return "-1" if the label does not indicate a real item
*/
-s16b label_to_equip(int c)
+INVENTORY_IDX label_to_equip(int c)
{
- int i;
+ INVENTORY_IDX i;
/* Convert */
- i = (islower(c) ? A2I(c) : -1) + INVEN_RARM;
+ i = (INVENTORY_IDX)(islower(c) ? A2I(c) : -1) + INVEN_RARM;
/* Verify the index */
if ((i < INVEN_RARM) || (i >= INVEN_TOTAL)) return (-1);
* Also, the tag "@xn" will work as well, where "n" is a any tag-char,\n
* and "x" is the "current" command_cmd code.\n
*/
-static bool get_tag(int *cp, char tag, int mode)
+static bool get_tag(COMMAND_CODE *cp, char tag, int mode)
{
- int i, start, end;
+ COMMAND_CODE i;
+ COMMAND_CODE start, end;
cptr s;
/* Extract index from mode */
* Also, the tag "@xn" will work as well, where "n" is a any tag-char,\n
* and "x" is the "current" command_cmd code.\n
*/
-static bool get_tag_floor(int *cp, char tag, int floor_list[], int floor_num)
+static bool get_tag_floor(COMMAND_CODE *cp, char tag, int floor_list[], int floor_num)
{
- int i;
+ COMMAND_CODE i;
cptr s;
/**** Find a tag in the form of {@x#} (allow alphabet tag) ***/
/* 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 */
/* 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 */
* @details
* Hack -- do not display "trailing" empty slots
*/
-int show_inven(int target_item)
+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 */
* @param target_item アイテムの選択処理を行うか否か。
* @return 選択したアイテムのタグ
*/
-int show_equip(int target_item)
+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 */
* @param i 選択アイテムID
* @return 正規のIDならばTRUEを返す。
*/
-static bool get_item_okay(int i)
+static bool get_item_okay(OBJECT_IDX i)
{
/* Illegal items */
if ((i < 0) || (i >= INVEN_TOTAL)) return (FALSE);
* We always erase the prompt when we are done, leaving a blank line,\n
* or a warning message, if appropriate, if no items are available.\n
*/
-bool get_item(int *cp, cptr pmt, cptr str, int mode)
+bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode)
{
- s16b this_o_idx, next_o_idx = 0;
+ OBJECT_IDX this_o_idx, next_o_idx = 0;
char which = ' ';
- int j, k, i1, i2, e1, e2;
+ int j;
+ OBJECT_IDX k;
+ OBJECT_IDX i1, i2;
+ OBJECT_IDX e1, e2;
bool done, item;
/* Repeat until done */
while (!done)
{
- int get_item_label = 0;
+ COMMAND_CODE get_item_label = 0;
/* Show choices */
int ni = 0;
/* 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;
* @param mode オプションフラグ
* @return プレイヤーによりアイテムが選択されたならTRUEを返す。/
*/
-bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
+bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, int mode)
{
char n1 = ' ', n2 = ' ', which = ' ';
- int j, k, i1, i2, e1, e2;
+ int j;
+ COMMAND_CODE i1, i2;
+ COMMAND_CODE e1, e2;
+ COMMAND_CODE k;
bool done, item;
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;
/* Repeat until done */
while (!done)
{
- int get_item_label = 0;
+ COMMAND_CODE get_item_label = 0;
/* Show choices */
int ni = 0;
/* Extract "query" setting */
ver = isupper(which);
- which = tolower(which);
+ which = (char)tolower(which);
/* Convert letter to inventory index */
if (command_wrk == (USE_INVEN))
*/
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;
OSDN Git Service
