[Refactor] #37353 メッセージ整理。

[hengbandforosx/hengbandosx.git] / src / object2.c

diff --git a/src/object2.c b/src/object2.c
index 321e1d2..d486eb3 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -200,7 +200,6 @@ void delete_object_idx(OBJECT_IDX o_idx)
        {
                POSITION y, x;
 
-               /* Location */
                y = j_ptr->iy;
                x = j_ptr->ix;
 
@@ -377,7 +376,6 @@ void compact_objects(int size)
                /* Redraw map */
                p_ptr->redraw |= (PR_MAP);
 
-               /* Window stuff */
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
        }
 
@@ -591,7 +589,6 @@ OBJECT_IDX o_pop(void)
        /* Warn the player (except during dungeon creation) */
        if (character_dungeon) msg_print(_("アイテムが多すぎる！", "Too many objects!"));
 
-       /* Oops */
        return (0);
 }
 
@@ -1544,7 +1541,6 @@ bool can_player_destroy_object(object_type *o_ptr)
                /* Combine the pack */
                p_ptr->notice |= (PN_COMBINE);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
                return FALSE;
@@ -1907,8 +1903,8 @@ void object_absorb(object_type *o_ptr, object_type *j_ptr)
        /* Hack -- blend "feelings" */
        if (j_ptr->feeling) o_ptr->feeling = j_ptr->feeling;
 
-       /* Hack -- could average discounts XXX XXX XXX */
-       /* Hack -- save largest discount XXX XXX XXX */
+       /* Hack -- could average discounts */
+       /* Hack -- save largest discount */
        if (o_ptr->discount < j_ptr->discount) o_ptr->discount = j_ptr->discount;
 
        /* Hack -- if rods are stacking, add the pvals (maximum timeouts) and current timeouts together. -LM- */
@@ -1967,12 +1963,10 @@ IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval)
        }
 
 #if 0
-       /* Oops */
        msg_format(_("アイテムがない (%d,%d)", "No object (%d,%d)"), tval, sval);
 #endif
 
 
-       /* Oops */
        return (0);
 }
 
@@ -4956,7 +4950,6 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
                /* Structure Copy */
                object_copy(o_ptr, q_ptr);
 
-               /* Location */
                o_ptr->iy = y;
                o_ptr->ix = x;
 
@@ -5187,7 +5180,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
                        /* Ignore distant grids */
                        if (d > 10) continue;
 
-                       /* Location */
                        ty = y + dy;
                        tx = x + dx;
 
@@ -5454,7 +5446,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
                msg_print(_("何かが足下に転がってきた。", "You feel something roll beneath your feet."));
        }
 
-       /* XXX XXX XXX */
 
        /* Result */
        return (o_idx);
@@ -5747,7 +5738,6 @@ void inven_item_increase(INVENTORY_IDX item, int num)
                /* Combine the pack */
                p_ptr->notice |= (PN_COMBINE);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
                /* Hack -- Clear temporary elemental brands if player takes off weapons */
@@ -5799,7 +5789,6 @@ void inven_item_optimize(INVENTORY_IDX item)
                /* Erase the "final" slot */
                object_wipe(&inventory[i]);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN);
        }
 
@@ -5821,11 +5810,9 @@ void inven_item_optimize(INVENTORY_IDX item)
                /* Recalculate mana XXX */
                p_ptr->update |= (PU_MANA);
 
-               /* Window stuff */
                p_ptr->window |= (PW_EQUIP);
        }
 
-       /* Window stuff */
        p_ptr->window |= (PW_SPELL);
 }
 
@@ -6120,7 +6107,6 @@ s16b inven_carry(object_type *o_ptr)
                        /* Recalculate bonuses */
                        p_ptr->update |= (PU_BONUS);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_INVEN);
 
                        /* Success */
@@ -6202,7 +6188,6 @@ s16b inven_carry(object_type *o_ptr)
        /* Combine and Reorder pack */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 
        /* Return the slot */
@@ -6461,7 +6446,6 @@ void combine_pack(void)
                                                }
                                        }
 
-                                       /* Window stuff */
                                        p_ptr->window |= (PW_INVEN);
 
                                        /* Take note */
@@ -6537,7 +6521,6 @@ void reorder_pack(void)
                /* Insert the moving item */
                object_copy(&inventory[j], q_ptr);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN);
        }
 
@@ -7002,9 +6985,9 @@ static int blow_damcalc(monster_type *m_ptr, monster_blow *blow_ptr)
  * @param yy 危険性を調査するマスのY座標
  * @return 警告を無視して進むことを選択するかか問題が無ければTRUE、警告に従ったならFALSEを返す。
  */
-bool process_warning(int xx, int yy)
+bool process_warning(POSITION xx, POSITION yy)
 {
-       int mx, my;
+       POSITION mx, my;
        cave_type *c_ptr;
        char o_name[MAX_NLEN];
 
@@ -7036,42 +7019,42 @@ bool process_warning(int xx, int yy)
                        /* Monster spells (only powerful ones)*/
                        if (projectable(my, mx, yy, xx))
             {
-                               u32b f4 = r_ptr->flags4;
-                               u32b f5 = r_ptr->a_ability_flags1;
-                               u32b f6 = r_ptr->a_ability_flags2;
+                               BIT_FLAGS f4 = r_ptr->flags4;
+                               BIT_FLAGS f5 = r_ptr->a_ability_flags1;
+                               BIT_FLAGS f6 = r_ptr->a_ability_flags2;
 
                                if (!(d_info[dungeon_type].flags1 & DF1_NO_MAGIC))
                                {
-                    if (f4 & RF4_BA_CHAO) spell_damcalc_by_spellnum(MS_BALL_CHAOS, GF_CHAOS, c_ptr->m_idx,  &dam_max0);
-                    if (f5 & RF5_BA_MANA) spell_damcalc_by_spellnum(MS_BALL_MANA, GF_MANA, c_ptr->m_idx, &dam_max0);
-                    if (f5 & RF5_BA_DARK) spell_damcalc_by_spellnum(MS_BALL_DARK, GF_DARK, c_ptr->m_idx, &dam_max0);
-                    if (f5 & RF5_BA_LITE) spell_damcalc_by_spellnum(MS_STARBURST, GF_LITE, c_ptr->m_idx, &dam_max0);
-                    if (f6 & RF6_HAND_DOOM) spell_damcalc_by_spellnum(MS_HAND_DOOM, GF_HAND_DOOM, c_ptr->m_idx, &dam_max0);
-                    if (f6 & RF6_PSY_SPEAR) spell_damcalc_by_spellnum(MS_PSY_SPEAR, GF_PSY_SPEAR, c_ptr->m_idx, &dam_max0);
+                                       if (f4 & RF4_BA_CHAO) spell_damcalc_by_spellnum(MS_BALL_CHAOS, GF_CHAOS, c_ptr->m_idx, &dam_max0);
+                                       if (f5 & RF5_BA_MANA) spell_damcalc_by_spellnum(MS_BALL_MANA, GF_MANA, c_ptr->m_idx, &dam_max0);
+                                       if (f5 & RF5_BA_DARK) spell_damcalc_by_spellnum(MS_BALL_DARK, GF_DARK, c_ptr->m_idx, &dam_max0);
+                                       if (f5 & RF5_BA_LITE) spell_damcalc_by_spellnum(MS_STARBURST, GF_LITE, c_ptr->m_idx, &dam_max0);
+                                       if (f6 & RF6_HAND_DOOM) spell_damcalc_by_spellnum(MS_HAND_DOOM, GF_HAND_DOOM, c_ptr->m_idx, &dam_max0);
+                                       if (f6 & RF6_PSY_SPEAR) spell_damcalc_by_spellnum(MS_PSY_SPEAR, GF_PSY_SPEAR, c_ptr->m_idx, &dam_max0);
                                }
-                if (f4 & RF4_ROCKET) spell_damcalc_by_spellnum(MS_ROCKET, GF_ROCKET, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_ACID) spell_damcalc_by_spellnum(MS_BR_ACID, GF_ACID, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_ELEC) spell_damcalc_by_spellnum(MS_BR_ELEC, GF_ELEC, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_FIRE) spell_damcalc_by_spellnum(MS_BR_FIRE, GF_FIRE, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_COLD) spell_damcalc_by_spellnum(MS_BR_COLD, GF_COLD, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_POIS) spell_damcalc_by_spellnum(MS_BR_POIS, GF_POIS, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_NETH) spell_damcalc_by_spellnum(MS_BR_NETHER, GF_NETHER, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_LITE) spell_damcalc_by_spellnum(MS_BR_LITE, GF_LITE, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_DARK) spell_damcalc_by_spellnum(MS_BR_DARK, GF_DARK, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_CONF) spell_damcalc_by_spellnum(MS_BR_CONF, GF_CONFUSION, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_SOUN) spell_damcalc_by_spellnum(MS_BR_SOUND, GF_SOUND, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_CHAO) spell_damcalc_by_spellnum(MS_BR_CHAOS, GF_CHAOS, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_DISE) spell_damcalc_by_spellnum(MS_BR_DISEN, GF_DISENCHANT, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_NEXU) spell_damcalc_by_spellnum(MS_BR_NEXUS, GF_NEXUS, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_TIME) spell_damcalc_by_spellnum(MS_BR_TIME, GF_TIME, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_INER) spell_damcalc_by_spellnum(MS_BR_INERTIA, GF_INERTIAL, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_GRAV) spell_damcalc_by_spellnum(MS_BR_GRAVITY, GF_GRAVITY, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_SHAR) spell_damcalc_by_spellnum(MS_BR_SHARDS, GF_SHARDS, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_PLAS) spell_damcalc_by_spellnum(MS_BR_PLASMA, GF_PLASMA, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_WALL) spell_damcalc_by_spellnum(MS_BR_FORCE, GF_FORCE, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_MANA) spell_damcalc_by_spellnum(MS_BR_MANA, GF_MANA, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_NUKE) spell_damcalc_by_spellnum(MS_BR_NUKE, GF_NUKE, c_ptr->m_idx, &dam_max0);
-                if (f4 & RF4_BR_DISI) spell_damcalc_by_spellnum(MS_BR_DISI, GF_DISINTEGRATE, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_ROCKET) spell_damcalc_by_spellnum(MS_ROCKET, GF_ROCKET, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_ACID) spell_damcalc_by_spellnum(MS_BR_ACID, GF_ACID, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_ELEC) spell_damcalc_by_spellnum(MS_BR_ELEC, GF_ELEC, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_FIRE) spell_damcalc_by_spellnum(MS_BR_FIRE, GF_FIRE, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_COLD) spell_damcalc_by_spellnum(MS_BR_COLD, GF_COLD, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_POIS) spell_damcalc_by_spellnum(MS_BR_POIS, GF_POIS, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_NETH) spell_damcalc_by_spellnum(MS_BR_NETHER, GF_NETHER, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_LITE) spell_damcalc_by_spellnum(MS_BR_LITE, GF_LITE, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_DARK) spell_damcalc_by_spellnum(MS_BR_DARK, GF_DARK, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_CONF) spell_damcalc_by_spellnum(MS_BR_CONF, GF_CONFUSION, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_SOUN) spell_damcalc_by_spellnum(MS_BR_SOUND, GF_SOUND, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_CHAO) spell_damcalc_by_spellnum(MS_BR_CHAOS, GF_CHAOS, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_DISE) spell_damcalc_by_spellnum(MS_BR_DISEN, GF_DISENCHANT, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_NEXU) spell_damcalc_by_spellnum(MS_BR_NEXUS, GF_NEXUS, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_TIME) spell_damcalc_by_spellnum(MS_BR_TIME, GF_TIME, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_INER) spell_damcalc_by_spellnum(MS_BR_INERTIA, GF_INERTIAL, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_GRAV) spell_damcalc_by_spellnum(MS_BR_GRAVITY, GF_GRAVITY, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_SHAR) spell_damcalc_by_spellnum(MS_BR_SHARDS, GF_SHARDS, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_PLAS) spell_damcalc_by_spellnum(MS_BR_PLASMA, GF_PLASMA, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_WALL) spell_damcalc_by_spellnum(MS_BR_FORCE, GF_FORCE, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_MANA) spell_damcalc_by_spellnum(MS_BR_MANA, GF_MANA, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_NUKE) spell_damcalc_by_spellnum(MS_BR_NUKE, GF_NUKE, c_ptr->m_idx, &dam_max0);
+                               if (f4 & RF4_BR_DISI) spell_damcalc_by_spellnum(MS_BR_DISI, GF_DISINTEGRATE, c_ptr->m_idx, &dam_max0);
                        }
 
                        /* Monster melee attacks */
@@ -7642,7 +7625,6 @@ static void drain_essence(void)
        item_tester_hook = object_is_weapon_armour_ammo;
        item_tester_no_ryoute = TRUE;
 
-       /* Get an item */
        q = _("どのアイテムから抽出しますか？", "Extract from which item? ");
        s = _("抽出できるアイテムがありません。", "You have nothing you can extract from.");
 
@@ -7854,7 +7836,6 @@ static void drain_essence(void)
        /* Combine the pack */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 }
 
@@ -8262,7 +8243,6 @@ static void add_essence(ESSENCE_IDX mode)
                item_tester_hook = object_is_weapon_armour_ammo;
        item_tester_no_ryoute = TRUE;
 
-       /* Get an item */
        q = _("どのアイテムを改良しますか？", "Improve which item? ");
        s = _("改良できるアイテムがありません。", "You have nothing to improve.");
 
@@ -8483,7 +8463,6 @@ static void add_essence(ESSENCE_IDX mode)
        /* Combine the pack */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 }
 
@@ -8501,7 +8480,6 @@ static void erase_essence(void)
 
        item_tester_hook = object_is_smith;
 
-       /* Get an item */
        q = _("どのアイテムのエッセンスを消去しますか？", "Remove from which item? ");
        s = _("エッセンスを付加したアイテムがありません。", "You have nothing to remove essence.");
 
@@ -8540,7 +8518,6 @@ static void erase_essence(void)
        /* Combine the pack */
        p_ptr->notice |= (PN_COMBINE | PN_REORDER);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN);
 }
 
@@ -8635,19 +8612,14 @@ void do_cmd_kaji(bool only_browse)
        {
                while (!mode)
                {
+                       prt(_("  a) エッセンス一覧", "  a) List essences"), 2, 14);
+                       prt(_("  b) エッセンス抽出", "  b) Extract essence"), 3, 14);
+                       prt(_("  c) エッセンス消去", "  c) Remove essence"), 4, 14);
+                       prt(_("  d) エッセンス付加", "  d) Add essence"), 5, 14);
+                       prt(_("  e) 武器/防具強化", "  e) Enchant weapon/armor"), 6, 14);
 #ifdef JP
-                       prt("  a) エッセンス一覧", 2, 14);
-                       prt("  b) エッセンス抽出", 3, 14);
-                       prt("  c) エッセンス消去", 4, 14);
-                       prt("  d) エッセンス付加", 5, 14);
-                       prt("  e) 武器/防具強化", 6, 14);
                        if (!get_com(format("どの能力を%sますか:", only_browse ? "調べ" : "使い"), &choice, TRUE))
 #else
-                       prt("  a) List essences", 2, 14);
-                       prt("  b) Extract essence", 3, 14);
-                       prt("  c) Remove essence", 4, 14);
-                       prt("  d) Add essence", 5, 14);
-                       prt("  e) Enchant weapon/armor", 6, 14);
                        if (!get_com("Command :", &choice, TRUE))
 #endif
                        {
@@ -8731,7 +8703,7 @@ void do_cmd_kaji(bool only_browse)
  * @param flgs 特別に追加するフラグを返す参照ポインタ
  * @return なし
  */
-void torch_flags(object_type *o_ptr, u32b *flgs)
+void torch_flags(object_type *o_ptr, BIT_FLAGS *flgs)
 {
        if ((o_ptr->tval == TV_LITE) && (o_ptr->sval == SV_LITE_TORCH))
        {
@@ -8752,7 +8724,7 @@ void torch_flags(object_type *o_ptr, u32b *flgs)
  * @param ds 特別なダイス面数を返す参照ポインタ
  * @return なし
  */
-void torch_dice(object_type *o_ptr, int *dd, int *ds)
+void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds)
 {
        if ((o_ptr->tval == TV_LITE) && (o_ptr->sval == SV_LITE_TORCH))
        {