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

[hengband/hengband.git] / src / realm-hex.c

diff --git a/src/realm-hex.c b/src/realm-hex.c
index fba010a..b6032e8 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -29,7 +29,7 @@
  */
 bool stop_hex_spell_all(void)
 {
-       int i;
+       SPELL_IDX i;
 
        for (i = 0; i < 32; i++)
        {
@@ -166,13 +166,11 @@ void check_hex(void)
                }
        }
 
-
        /* Culcurates final mana cost */
        need_mana_frac = 0;
        s64b_div(&need_mana, &need_mana_frac, 0, 3); /* Divide by 3 */
        need_mana += (CASTING_HEX_NUM(p_ptr) - 1);
 
-
        /* Not enough mana */
        if (s64b_cmp(p_ptr->csp, p_ptr->csp_frac, need_mana, need_mana_frac) < 0)
        {
@@ -324,7 +322,7 @@ bool multiply_barrier(MONSTER_IDX m_idx)
 * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST / SPELL_CONT / SPELL_STOP)
 * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST / SPELL_CONT / SPELL_STOP 時はNULL文字列を返す。
 */
-cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
+concptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
 {
        bool name = (mode == SPELL_NAME) ? TRUE : FALSE;
        bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
@@ -410,7 +408,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (cast)
                {
                        OBJECT_IDX item;
-                       cptr q, s;
+                       concptr q, s;
                        GAME_TEXT o_name[MAX_NLEN];
                        object_type *o_ptr;
                        u32b f[TR_FLAG_SIZE];
@@ -419,9 +417,9 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        q = _("どれを呪いますか？", "Which weapon do you curse?");
                        s = _("武器を装備していない。", "You wield no weapons.");
 
-                       if (!get_item(&item, q, s, (USE_EQUIP))) return FALSE;
+                       o_ptr = choose_object(&item, q, s, (USE_EQUIP));
+                       if (!o_ptr) return FALSE;
 
-                       o_ptr = &inventory[item];
                        object_desc(o_name, o_ptr, OD_NAME_ONLY);
                        object_flags(o_ptr, f);
 
@@ -706,7 +704,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (cast)
                {
                        OBJECT_IDX item;
-                       cptr q, s;
+                       concptr q, s;
                        GAME_TEXT o_name[MAX_NLEN];
                        object_type *o_ptr;
                        u32b f[TR_FLAG_SIZE];
@@ -715,7 +713,8 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        q = _("どれを呪いますか？", "Which piece of armour do you curse?");
                        s = _("防具を装備していない。", "You wield no piece of armours.");
 
-                       if (!get_item(&item, q, s, (USE_EQUIP))) return FALSE;
+                       o_ptr = choose_object(&item, q, s, (USE_EQUIP));
+                       if (!o_ptr) return FALSE;
 
                        o_ptr = &inventory[item];
                        object_desc(o_name, o_ptr, OD_NAME_ONLY);
@@ -875,7 +874,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                                flag = TRUE;
                        }
-                       for (i = A_STR; i < 6; i++)
+                       for (i = A_STR; i < A_MAX; i++)
                        {
                                if (p_ptr->stat_cur[i] < p_ptr->stat_max[i])
                                {
@@ -886,8 +885,6 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                                        if (p_ptr->stat_cur[i] > p_ptr->stat_max[i])
                                                p_ptr->stat_cur[i] = p_ptr->stat_max[i];
-
-                                       /* Recalculate bonuses */
                                        p_ptr->update |= (PU_BONUS);
 
                                        flag = TRUE;
@@ -915,7 +912,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (cast)
                {
                        OBJECT_IDX item;
-                       cptr s, q;
+                       concptr s, q;
                        u32b f[TR_FLAG_SIZE];
                        object_type *o_ptr;
 
@@ -923,9 +920,9 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        q = _("どの装備品から吸収しますか？", "Which cursed equipment do you drain mana from?");
                        s = _("呪われたアイテムを装備していない。", "You have no cursed equipment.");
 
-                       if (!get_item(&item, q, s, (USE_EQUIP))) return FALSE;
+                       o_ptr = choose_object(&item, q, s, (USE_EQUIP));
+                       if (!o_ptr) return FALSE;
 
-                       o_ptr = &inventory[item];
                        object_flags(o_ptr, f);
 
                        p_ptr->csp += (p_ptr->lev / 5) + randint1(p_ptr->lev / 5);