#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

diff --git a/src/cmd5.c b/src/cmd5.c
index 07a2828..00c11a3 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -466,7 +466,8 @@ static void confirm_use_force(bool browse_only)
  */
 void do_cmd_browse(void)
 {
-       int             item, sval;
+       OBJECT_IDX item;
+       OBJECT_SUBTYPE_VALUE sval;
        REALM_IDX use_realm = 0;
        int j, line;
        SPELL_IDX spell = -1;

diff --git a/src/do-spell.c b/src/do-spell.c
index ea83262..72c0e44 100644 (file)
--- a/src/do-spell.c
+++ b/src/do-spell.c
@@ -193,11 +193,11 @@ static int beam_chance(void)
  * @param mode モンスター生成条件フラグ
  * @return モンスターが（敵対も含めて）召還されたならばTRUEを返す。
  */
-static bool trump_summoning(int num, bool pet, int y, int x, int lev, int type, u32b mode)
+static bool trump_summoning(int num, bool pet, POSITION y, POSITION x, DEPTH lev, int type, BIT_FLAGS mode)
 {
-       int plev = p_ptr->lev;
+       PLAYER_LEVEL plev = p_ptr->lev;
 
-       int who;
+       MONSTER_IDX who;
        int i;
        bool success = FALSE;
 

diff --git a/src/dungeon.c b/src/dungeon.c
index dc55eba..1777ff7 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4045,7 +4045,7 @@ extern void do_cmd_borg(void);
  */
 static void process_command(void)
 {
-       int old_now_message = now_message;
+       COMMAND_CODE old_now_message = now_message;
 
 #ifdef ALLOW_REPEAT /* TNB */
 

diff --git a/src/externs.h b/src/externs.h
index dec3378..9874da6 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1014,8 +1014,8 @@ extern bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUB
 extern bool item_tester_okay(object_type *o_ptr);
 extern void display_inven(void);
 extern void display_equip(void);
-extern int show_inven(int target_item);
-extern int show_equip(int target_item);
+extern COMMAND_CODE show_inven(int target_item);
+extern COMMAND_CODE show_equip(int target_item);
 extern void toggle_inven_equip(void);
 extern bool can_get_item(void);
 extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode);

diff --git a/src/hissatsu.c b/src/hissatsu.c
index ec0316e..3421e76 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -396,7 +396,8 @@ void do_cmd_hissatsu(void)
  */
 void do_cmd_gain_hissatsu(void)
 {
-       int item, i, j;
+       OBJECT_IDX item;
+       int i, j;
 
        object_type *o_ptr;
        cptr q, s;

diff --git a/src/init1.c b/src/init1.c
index 7bc8e61..6f7f527 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -1089,7 +1089,7 @@ static bool add_name(u32b *offset, header *head, cptr buf)
  * Returns FALSE when there isn't enough space available to store
  * the text.
  */
-static bool add_tag(s16b *offset, header *head, cptr buf)
+static bool add_tag(STR_OFFSET *offset, header *head, cptr buf)
 {
        u32b i;
 
@@ -1718,7 +1718,7 @@ errr parse_f_info(char *buf, header *head)
        /* Process 'M' for "Mimic" (one line only) */
        else if (buf[0] == 'M')
        {
-               s16b offset;
+               STR_OFFSET offset;
 
                if (!add_tag(&offset, head, buf + 2)) return PARSE_ERROR_OUT_OF_MEMORY;
 
@@ -1866,7 +1866,7 @@ errr parse_f_info(char *buf, header *head)
        /* Process 'K' for "States" (up to four lines + default (which cannot be last)) */
        else if (buf[0] == 'K')
        {
-               s16b offset;
+               STR_OFFSET offset;
 
                /* Find the next empty state slot (if any) */
                for (i = 0; i < MAX_FEAT_STATES; i++) if (f_ptr->state[i].action == FF_FLAG_MAX) break;
@@ -3001,8 +3001,8 @@ errr parse_r_info(char *buf, header *head)
                r_ptr->level = (DEPTH)lev;
                r_ptr->rarity = (RARITY)rar;
                r_ptr->extra = pad;
-               r_ptr->mexp = exp;
-               r_ptr->next_exp = nextexp;
+               r_ptr->mexp = (EXP)exp;
+               r_ptr->next_exp = (EXP)nextexp;
                r_ptr->next_r_idx = (IDX)nextmon;
        }
 

diff --git a/src/monster2.c b/src/monster2.c
index 4b174d7..ff54dae 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -4104,7 +4104,7 @@ bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int t
  */
 bool summon_named_creature (MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode)
 {
-       int x, y;
+       POSITION x, y;
 
        /* Paranoia */
        /* if (!r_idx) return; */
@@ -4134,7 +4134,7 @@ bool multiply_monster(MONSTER_IDX m_idx, bool clone, u32b mode)
 {
        monster_type    *m_ptr = &m_list[m_idx];
 
-       int y, x;
+       POSITION y, x;
 
        if (!mon_scatter(m_ptr->r_idx, &y, &x, m_ptr->fy, m_ptr->fx, 1))
                return FALSE;

diff --git a/src/mspells2.c b/src/mspells2.c
index bdd6f8a..910bc96 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -73,15 +73,15 @@ static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
  * @param is_friend TRUEならば、プレイヤーを巻き込む時にブレスの判定をFALSEにする。
  * @return ブレスを直接当てられるならばTRUEを返す
  */
-static bool breath_direct(int y1, int x1, int y2, int x2, int rad, int typ, bool is_friend)
+static bool breath_direct(POSITION y1, POSITION x1, POSITION y2, POSITION x2, POSITION rad, int typ, bool is_friend)
 {
        /* Must be the same as projectable() */
 
        int i;
 
        /* Initial grid */
-       int y = y1;
-       int x = x1;
+       POSITION y = y1;
+       POSITION x = x1;
 
        int grid_n = 0;
        u16b grid_g[512];

diff --git a/src/object1.c b/src/object1.c
index f7fb66f..66119b2 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -2142,7 +2142,7 @@ static void prepare_label_string_floor(char *label, int floor_list[], int floor_
  * @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;
        int             col, cur_col, len;
@@ -2308,7 +2308,7 @@ int show_inven(int target_item)
  * @param target_item アイテムの選択処理を行うか否か。
  * @return 選択したアイテムのタグ
  */
-int show_equip(int target_item)
+COMMAND_CODE show_equip(int target_item)
 {
        int             i, j, k, l;
        int             col, cur_col, len;

diff --git a/src/snipe.c b/src/snipe.c
index a557170..cc35c9a 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -222,7 +222,7 @@ void display_snipe_list(void)
  */
 static int get_snipe_power(COMMAND_CODE *sn, bool only_browse)
 {
-       int             i;
+       COMMAND_CODE i;
        int             num = 0;
        int             y = 1;
        int             x = 20;

diff --git a/src/spells3.c b/src/spells3.c
index 9cac604..92af9b7 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -875,7 +875,7 @@ DUNGEON_IDX choose_dungeon(cptr note, POSITION y, POSITION x)
                else if (max_dlv[i] == d_info[i].maxdepth) seiha = TRUE;
 
                sprintf(buf,_("      %c) %c%-12s : 最大 %d 階", "      %c) %c%-16s : Max level %d"), 
-                                       'a'+num, seiha ? '!' : ' ', d_name + d_info[i].name, max_dlv[i]);
+                                       'a'+num, seiha ? '!' : ' ', d_name + d_info[i].name, (int)max_dlv[i]);
                prt(buf, y + num, x);
                dun[num++] = i;
        }
@@ -995,7 +995,8 @@ bool reset_recall(void)
 
        if (!select_dungeon) return FALSE;
        /* Prompt */
-       sprintf(ppp, _("何階にセットしますか (%d-%d):", "Reset to which level (%d-%d): "), d_info[select_dungeon].mindepth, max_dlv[select_dungeon]);
+       sprintf(ppp, _("何階にセットしますか (%d-%d):", "Reset to which level (%d-%d): "),
+               (int)d_info[select_dungeon].mindepth, (int)max_dlv[select_dungeon]);
 
        /* Default */
        sprintf(tmp_val, "%d", (int)MAX(dun_level, 1));
@@ -1295,7 +1296,7 @@ void phlogiston(void)
  */
 void brand_weapon(int brand_type)
 {
-       int         item;
+       OBJECT_IDX item;
        object_type *o_ptr;
        cptr        q, s;
 
@@ -2028,9 +2029,10 @@ int remove_all_curse(void)
  */
 bool alchemy(void)
 {
-       int item, amt = 1;
+       OBJECT_IDX item;
+       int amt = 1;
        ITEM_NUMBER old_number;
-       long price;
+       PRICE price;
        bool force = FALSE;
        object_type *o_ptr;
        char o_name[MAX_NLEN];
@@ -2297,7 +2299,7 @@ bool enchant(object_type *o_ptr, int n, int eflag)
  */
 bool enchant_spell(int num_hit, int num_dam, int num_ac)
 {
-       int         item;
+       OBJECT_IDX item;
        bool        okay = FALSE;
        object_type *o_ptr;
        char        o_name[MAX_NLEN];
@@ -2394,7 +2396,7 @@ static bool item_tester_hook_nameless_weapon_armour(object_type *o_ptr)
  */
 bool artifact_scroll(void)
 {
-       int             item;
+       OBJECT_IDX item;
        bool            okay = FALSE;
        object_type     *o_ptr;
        char            o_name[MAX_NLEN];
@@ -2613,7 +2615,7 @@ static bool item_tester_hook_identify_weapon_armour(object_type *o_ptr)
  */
 bool ident_spell(bool only_equip)
 {
-       int             item;
+       OBJECT_IDX item;
        object_type     *o_ptr;
        char            o_name[MAX_NLEN];
        cptr            q, s;
@@ -2699,7 +2701,7 @@ bool ident_spell(bool only_equip)
  */
 bool mundane_spell(bool only_equip)
 {
-       int             item;
+       OBJECT_IDX item;
        object_type     *o_ptr;
        cptr            q, s;
 
@@ -2783,7 +2785,7 @@ static bool item_tester_hook_identify_fully_weapon_armour(object_type *o_ptr)
  */
 bool identify_fully(bool only_equip)
 {
-       int             item;
+       OBJECT_IDX item;
        object_type     *o_ptr;
        char            o_name[MAX_NLEN];
        cptr            q, s;
@@ -2907,7 +2909,8 @@ bool item_tester_hook_recharge(object_type *o_ptr)
  */
 bool recharge(int power)
 {
-       int item, lev;
+       OBJECT_IDX item;
+       int lev;
        int recharge_strength;
        TIME_EFFECT recharge_amount;
 
@@ -3201,9 +3204,9 @@ bool recharge(int power)
  */
 bool bless_weapon(void)
 {
-       int             item;
+       OBJECT_IDX item;
        object_type     *o_ptr;
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
        char            o_name[MAX_NLEN];
        cptr            q, s;
 
@@ -3385,7 +3388,7 @@ msg_format("%s は劣化した！",
  */
 bool pulish_shield(void)
 {
-       int             item;
+       OBJECT_IDX item;
        object_type     *o_ptr;
        u32b flgs[TR_FLAG_SIZE];
        char            o_name[MAX_NLEN];
@@ -4874,7 +4877,7 @@ int cold_dam(int dam, cptr kb_str, int monspell, bool aura)
  */
 bool rustproof(void)
 {
-       int         item;
+       OBJECT_IDX item;
        object_type *o_ptr;
        char        o_name[MAX_NLEN];
        cptr        q, s;
@@ -5386,7 +5389,8 @@ bool eat_magic(int power)
 {
        object_type * o_ptr;
        object_kind *k_ptr;
-       int lev, item;
+       int lev;
+       OBJECT_IDX item;
        int recharge_strength = 0;
 
        bool fail = FALSE;

diff --git a/src/store.c b/src/store.c
index 6784e90..c49a60d 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -3887,7 +3887,8 @@ msg_format("%sを $%ldで購入しました。", o_name, (long)price);
 static void store_sell(void)
 {
        int choice;
-       int item, item_pos;
+       OBJECT_IDX item;
+       int item_pos;
        int amt;
 
        s32b price, value, dummy;

diff --git a/src/util.c b/src/util.c
index f66b35d..20373ca 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -4620,7 +4620,7 @@ void request_command(int shopping)
        if (always_repeat && (command_arg <= 0))
        {
                /* Hack -- auto repeat certain commands */
-               if (my_strchr("TBDoc+", command_cmd))
+               if (my_strchr("TBDoc+", (COMMAND_CODE)command_cmd))
                {
                        /* Repeat 99 times */
                        command_arg = 99;