[Refactor] #37353 コメント整理。 / Refactor comments.

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

diff --git a/src/realm-hex.c b/src/realm-hex.c
index 9074799..7a614eb 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -19,6 +19,8 @@
 #include "cmd-spell.h"
 #include "cmd-quaff.h"
 #include "object-hook.h"
+#include "object-curse.h"
+#include "projection.h"
 
 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */
 
@@ -28,7 +30,7 @@
  */
 bool stop_hex_spell_all(void)
 {
-       int i;
+       SPELL_IDX i;
 
        for (i = 0; i < 32; i++)
        {
@@ -38,10 +40,8 @@ bool stop_hex_spell_all(void)
        CASTING_HEX_FLAGS(p_ptr) = 0;
        CASTING_HEX_NUM(p_ptr) = 0;
 
-       /* Print message */
        if (p_ptr->action == ACTION_SPELL) set_action(ACTION_NONE);
 
-       /* Redraw status */
        p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
        p_ptr->redraw |= (PR_EXTRA | PR_HP | PR_MANA);
 
@@ -55,11 +55,11 @@ bool stop_hex_spell_all(void)
 bool stop_hex_spell(void)
 {
        int spell;
-       char choice;
+       char choice = 0;
        char out_val[160];
        bool flag = FALSE;
-       TERM_POSITION y = 1;
-       TERM_POSITION x = 20;
+       TERM_LEN y = 1;
+       TERM_LEN x = 20;
        int sp[MAX_KEEP];
 
        if (!hex_spelling_any())
@@ -75,13 +75,8 @@ bool stop_hex_spell(void)
        }
        else
        {
-#ifdef JP
-               strnfmt(out_val, 78, "どの呪文の詠唱を中断しますか？(呪文 %c-%c, 'l'全て, ESC)",
-                       I2A(0), I2A(CASTING_HEX_NUM(p_ptr) - 1));
-#else
-               strnfmt(out_val, 78, "Which spell do you stop casting? (Spell %c-%c, 'l' to all, ESC)",
+               strnfmt(out_val, 78, _("どの呪文の詠唱を中断しますか？(呪文 %c-%c, 'l'全て, ESC)", "Which spell do you stop casting? (Spell %c-%c, 'l' to all, ESC)"),
                        I2A(0), I2A(CASTING_HEX_NUM(p_ptr) - 1));
-#endif
 
                screen_save();
 
@@ -89,7 +84,7 @@ bool stop_hex_spell(void)
                {
                        int n = 0;
                        Term_erase(x, y, 255);
-                       prt("     名前", y, x + 5);
+                       prt(_("     名前", "     Name"), y, x + 5);
                        for (spell = 0; spell < 32; spell++)
                        {
                                if (hex_spelling(spell))
@@ -124,7 +119,6 @@ bool stop_hex_spell(void)
                CASTING_HEX_NUM(p_ptr)--;
        }
 
-       /* Redraw status */
        p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
        p_ptr->redraw |= (PR_EXTRA | PR_HP | PR_MANA);
 
@@ -140,7 +134,7 @@ bool stop_hex_spell(void)
 void check_hex(void)
 {
        int spell;
-       s32b need_mana;
+       MANA_POINT need_mana;
        u32b need_mana_frac;
        bool res = FALSE;
 
@@ -173,13 +167,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)
        {
@@ -195,23 +187,13 @@ void check_hex(void)
                p_ptr->redraw |= PR_MANA;
                if (res)
                {
-#ifdef JP
-                       msg_print("詠唱を再開した。");
-#else
-                       msg_print("You restart spelling.");
-#endif
+                       msg_print(_("詠唱を再開した。", "You restart spelling."));
+
                        p_ptr->action = ACTION_SPELL;
 
-                       /* Recalculate bonuses */
                        p_ptr->update |= (PU_BONUS | PU_HP);
-
-                       /* Redraw map and status bar */
                        p_ptr->redraw |= (PR_MAP | PR_STATUS | PR_STATE);
-
-                       /* Update monsters */
                        p_ptr->update |= (PU_MONSTERS);
-
-                       /* Window stuff */
                        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
                }
        }
@@ -252,14 +234,9 @@ void check_hex(void)
 bool hex_spell_fully(void)
 {
        int k_max = 0;
-
        k_max = (p_ptr->lev / 15) + 1;
-
-       /* Paranoia */
        k_max = MIN(k_max, MAX_KEEP);
-
        if (CASTING_HEX_NUM(p_ptr) < k_max) return FALSE;
-
        return TRUE;
 }
 
@@ -346,7 +323,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;
@@ -413,7 +390,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (info) return info_damage(1, power, 0);
                if (cast || cont)
                {
-                       project_hack(GF_POIS, randint1(power));
+                       project_all_los(GF_POIS, randint1(power));
                }
                break;
 
@@ -432,8 +409,8 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (cast)
                {
                        OBJECT_IDX item;
-                       cptr q, s;
-                       char o_name[MAX_NLEN];
+                       concptr q, s;
+                       GAME_TEXT o_name[MAX_NLEN];
                        object_type *o_ptr;
                        u32b f[TR_FLAG_SIZE];
 
@@ -441,9 +418,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);
 
@@ -609,7 +586,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (info) return info_damage(1, power, 0);
                if (cast || cont)
                {
-                       project_hack(GF_HYPODYNAMIA, randint1(power));
+                       project_all_los(GF_HYPODYNAMIA, randint1(power));
                }
                break;
 
@@ -728,8 +705,8 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (cast)
                {
                        OBJECT_IDX item;
-                       cptr q, s;
-                       char o_name[MAX_NLEN];
+                       concptr q, s;
+                       GAME_TEXT o_name[MAX_NLEN];
                        object_type *o_ptr;
                        u32b f[TR_FLAG_SIZE];
 
@@ -737,7 +714,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);
@@ -848,7 +826,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (info) return info_damage(1, power, 0);
                if (cast || cont)
                {
-                       project_hack(GF_PSI_DRAIN, randint1(power));
+                       project_all_los(GF_PSI_DRAIN, randint1(power));
                }
                break;
 
@@ -897,7 +875,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])
                                {
@@ -908,8 +886,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;
@@ -923,7 +899,6 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                if (cont) CASTING_HEX_NUM(p_ptr)--;
                                if (CASTING_HEX_NUM(p_ptr)) p_ptr->action = ACTION_NONE;
 
-                               /* Redraw status */
                                p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
                                p_ptr->redraw |= (PR_EXTRA);
 
@@ -938,7 +913,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;
 
@@ -946,9 +921,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);
@@ -1136,7 +1111,6 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (p_ptr->action != ACTION_SPELL) set_action(ACTION_SPELL);
        }
 
-       /* Redraw status */
        if (!info)
        {
                p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);