[Refactor] #37353 型の置換。 / Type replacement.

diff --git a/src/cmd4.c b/src/cmd4.c
index a0a5a19..24bfbb2 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -964,18 +964,14 @@ void do_cmd_nikki(void)
 void do_cmd_redraw(void)
 {
        int j;
-
        term *old = Term;
 
 
        /* Hack -- react to changes */
        Term_xtra(TERM_XTRA_REACT, 0);
 
-
        /* Combine and Reorder the pack (later) */
        p_ptr->update |= (PU_COMBINE | PU_REORDER);
-
-
        p_ptr->update |= (PU_TORCH);
        p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
        p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
@@ -3788,8 +3784,6 @@ void do_cmd_note(void)
  */
 void do_cmd_version(void)
 {
-       /* Silly message */
-
 #if FAKE_VER_EXTRA > 0
        msg_format(_("変愚蛮怒(Hengband) %d.%d.%d.%d", "You are playing Hengband %d.%d.%d.%d."),
                FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH, FAKE_VER_EXTRA);
@@ -3856,6 +3850,8 @@ static cptr do_cmd_feeling_text_lucky[11] =
  */
 void do_cmd_feeling(void)
 {
+       if (p_ptr->wild_mode) return;
+
        /* No useful feeling in quests */
        if (p_ptr->inside_quest && !random_quest_number(dun_level))
        {

diff --git a/src/dungeon.c b/src/dungeon.c
index 2e47cb6..8905bd7 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4499,7 +4499,7 @@ static void process_command(void)
                /* Repeat level feeling */
                case KTRL('F'):
                {
-                       if (!p_ptr->wild_mode) do_cmd_feeling();
+                       do_cmd_feeling();
                        break;
                }
 

diff --git a/src/object2.c b/src/object2.c
index b471dee..a7f1745 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -1897,11 +1897,11 @@ void object_absorb(object_type *o_ptr, object_type *j_ptr)
  * @param sval 検索したいベースアイテムのsval
  * @return なし
  */
-IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval)
+KIND_OBJECT_IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval)
 {
-       IDX k;
+       KIND_OBJECT_IDX k;
        int num = 0;
-       IDX bk = 0;
+       KIND_OBJECT_IDX bk = 0;
 
        /* Look for it */
        for (k = 1; k < max_k_idx; k++)
@@ -2208,8 +2208,7 @@ static bool make_artifact_special(object_type *o_ptr)
  */
 static bool make_artifact(object_type *o_ptr)
 {
-       IDX i;
-
+       ARTIFACT_IDX i;
 
        /* No artifacts in the town */
        if (!dun_level) return (FALSE);

diff --git a/src/spells3.c b/src/spells3.c
index b82624d..b5de2ac 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -924,7 +924,7 @@ bool reset_recall(void)
                        do_cmd_write_nikki(NIKKI_TRUMP, select_dungeon, _("フロア・リセットで", "using a scroll of reset recall"));
                                        /* Accept request */
 #ifdef JP
-msg_format("%sの帰還レベルを %d 階にセット。", d_name+d_info[select_dungeon].name, dummy, dummy * 50);
+               msg_format("%sの帰還レベルを %d 階にセット。", d_name+d_info[select_dungeon].name, dummy, dummy * 50);
 #else
                msg_format("Recall depth set to level %d (%d').", dummy, dummy * 50);
 #endif
@@ -1641,8 +1641,8 @@ void fetch(DIRECTION dir, WEIGHT wgt, bool require_los)
        cave[p_ptr->y][p_ptr->x].o_idx = i; /* 'move' it */
 
        o_ptr->next_o_idx = 0;
-       o_ptr->iy = (byte)p_ptr->y;
-       o_ptr->ix = (byte)p_ptr->x;
+       o_ptr->iy = p_ptr->y;
+       o_ptr->ix = p_ptr->x;
 
        object_desc(o_name, o_ptr, OD_NAME_ONLY);
        msg_format(_("%^sがあなたの足元に飛んできた。", "%^s flies through the air to your feet."), o_name);
@@ -1922,7 +1922,6 @@ bool alchemy(void)
                o_ptr = &o_list[0 - item];
        }
 
-
        /* See how many items */
        if (o_ptr->number > 1)
        {
@@ -1933,7 +1932,6 @@ bool alchemy(void)
                if (amt <= 0) return FALSE;
        }
 
-
        old_number = o_ptr->number;
        o_ptr->number = amt;
        object_desc(o_name, o_ptr, 0);
@@ -2050,7 +2048,6 @@ bool enchant(object_type *o_ptr, int n, int eflag)
        bool    a = object_is_artifact(o_ptr);
        bool    force = (eflag & ENCH_FORCE);
 
-
        /* Large piles resist enchantment */
        prob = o_ptr->number * 100;
 
@@ -2125,11 +2122,9 @@ bool enchant(object_type *o_ptr, int n, int eflag)
 
        /* Failure */
        if (!res) return (FALSE);
-       p_ptr->update |= (PU_BONUS);
 
        /* Combine / Reorder the pack (later) */
-       p_ptr->update |= (PU_COMBINE | PU_REORDER);
-
+       p_ptr->update |= (PU_BONUS | PU_COMBINE | PU_REORDER);
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
        calc_android_exp();
@@ -2357,11 +2352,8 @@ bool identify_item(object_type *o_ptr)
 
        /* Player touches it */
        o_ptr->marked |= OM_TOUCHED;
-       p_ptr->update |= (PU_BONUS);
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
+       p_ptr->update |= (PU_BONUS | PU_COMBINE | PU_REORDER);
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
        strcpy(record_o_name, o_name);
@@ -2897,7 +2889,6 @@ bool recharge(int power)
 
        /* Combine / Reorder the pack (later) */
        p_ptr->update |= (PU_COMBINE | PU_REORDER);
-
        p_ptr->window |= (PW_INVEN);
 
        /* Something was done */
@@ -2991,8 +2982,7 @@ bool bless_weapon(void)
        if (have_flag(flgs, TR_BLESSED))
        {
 #ifdef JP
-msg_format("%s は既に祝福されている。",
-    o_name    );
+               msg_format("%s は既に祝福されている。", o_name);
 #else
                msg_format("%s %s %s blessed already.",
                    ((item >= 0) ? "Your" : "The"), o_name,
@@ -3052,20 +3042,17 @@ msg_format("%s は既に祝福されている。",
                        msg_print(_("周囲が凡庸な雰囲気で満ちた...", "There is a static feeling in the air..."));
 
 #ifdef JP
-msg_format("%s は劣化した！",
-     o_name    );
+                       msg_format("%s は劣化した！", o_name);
 #else
-                       msg_format("%s %s %s disenchanted!",
-                           ((item >= 0) ? "Your" : "The"), o_name,
-                           ((o_ptr->number > 1) ? "were" : "was"));
+                       msg_format("%s %s %s disenchanted!", ((item >= 0) ? "Your" : "The"), o_name,
+                               ((o_ptr->number > 1) ? "were" : "was"));
 #endif
 
                }
        }
-       p_ptr->update |= (PU_BONUS);
 
+       p_ptr->update |= (PU_BONUS);
        p_ptr->window |= (PW_EQUIP | PW_PLAYER);
-
        calc_android_exp();
 
        return TRUE;