[Refactor] #37353 キーワード定義修正。 / Redefine keywords.

diff --git a/src/cmd-spell.h b/src/cmd-spell.h
index 3195cb8..beacfd5 100644 (file)
--- a/src/cmd-spell.h
+++ b/src/cmd-spell.h
@@ -1,10 +1,9 @@
-\r
-static const concptr s_dam = _("損傷:", "dam ");\r
-static const concptr s_random = _("ランダム", "random");\r
-static const concptr s_rng = _("射程:", "rng ");\r
-static const concptr s_dur = _("期間:", "dur ");\r
-static const concptr s_range = _("範囲:", "range ");\r
-static const concptr s_heal = _("回復:", "heal ");\r
+#define KWD_DAM      _("損傷:", "dam ")\r
+#define KWD_RANGE    _("射程:", "rng ")\r
+#define KWD_DURATION _("期間:", "dur ")\r
+#define KWD_SPHERE   _("範囲:", "range ")\r
+#define KWD_HEAL     _("回復:", "heal ")\r
+#define KWD_RANDOM   _("ランダム", "random")\r
 \r
 extern concptr info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base);\r
 extern concptr info_damage(DICE_NUMBER dice, DICE_SID sides, int base);\r

diff --git a/src/mane.c b/src/mane.c
index ed399f4..86ad761 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -31,31 +31,31 @@ static void mane_info(char *p, int power, HIT_POINT dam)
        strcpy(p, "");
 
        if ((power > 2 && power < 41) || (power > 41 && power < 59) || (power == 75))
-               sprintf(p, " %s%d", s_dam, (int)dam);
+               sprintf(p, " %s%d", KWD_DAM, (int)dam);
        else
        {
                switch (power)
                {
                        case 41:
-                               sprintf(p, " %sd%d+%d", s_heal, plev * 3, plev);
+                               sprintf(p, " %sd%d+%d", KWD_HEAL, plev * 3, plev);
                                break;
                        case 64:
-                               sprintf(p, " %sd%d+%d", s_dur, 20+plev, plev);
+                               sprintf(p, " %sd%d+%d", KWD_DURATION, 20+plev, plev);
                                break;
                        case 66:
-                               sprintf(p, " %s%d", s_heal, plev*6);
+                               sprintf(p, " %s%d", KWD_HEAL, plev*6);
                                break;
                        case 67:
-                               sprintf(p, " %sd7+7", s_dur);
+                               sprintf(p, " %sd7+7", KWD_DURATION);
                                break;
                        case 68:
-                               sprintf(p, " %s10", s_range);
+                               sprintf(p, " %s10", KWD_SPHERE);
                                break;
                        case 69:
-                               sprintf(p, " %s%d", s_range, plev * 5);
+                               sprintf(p, " %s%d", KWD_SPHERE, plev * 5);
                                break;
                        case 79:
-                               sprintf(p, " %s5", s_range);
+                               sprintf(p, " %s5", KWD_SPHERE);
                                break;
                        default:
                                break;

diff --git a/src/mind.c b/src/mind.c
index 3752fae..941dfff 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -551,22 +551,22 @@ void mindcraft_info(char *p, int use_mind, int power)
                switch (power)
                {
                case 0:  break;
-               case 1:  sprintf(p, " %s%dd%d", s_dam, 3 + ((plev - 1) / 4), 3 + plev/15); break;
-               case 2:  sprintf(p, " %s10", s_range); break;
-               case 3:  sprintf(p, " %s%d", s_range, plev * 5);  break;
+               case 1:  sprintf(p, " %s%dd%d", KWD_DAM, 3 + ((plev - 1) / 4), 3 + plev/15); break;
+               case 2:  sprintf(p, " %s10", KWD_SPHERE); break;
+               case 3:  sprintf(p, " %s%d", KWD_SPHERE, plev * 5);  break;
                case 4:  break;
-               case 5: sprintf(p, " %s%dd8", s_dam, 8 + ((plev - 5) / 4));  break;
-               case 6:  sprintf(p, " %s%d", s_dur, plev);  break;
+               case 5: sprintf(p, " %s%dd8", KWD_DAM, 8 + ((plev - 5) / 4));  break;
+               case 6:  sprintf(p, " %s%d", KWD_DURATION, plev);  break;
                case 7:  break;
-               case 8:  sprintf(p, (plev < 25 ? " %s%d" : " %sd%d"), s_dam, (plev < 25 ? plev * 3 / 2 : plev * ((plev - 5) / 10 + 1))); break;
-               case 9:  sprintf(p, " %s10+d%d", s_dur, plev * 3 / 2);  break;
+               case 8:  sprintf(p, (plev < 25 ? " %s%d" : " %sd%d"), KWD_DAM, (plev < 25 ? plev * 3 / 2 : plev * ((plev - 5) / 10 + 1))); break;
+               case 9:  sprintf(p, " %s10+d%d", KWD_DURATION, plev * 3 / 2);  break;
 #ifdef JP
                case 10: sprintf(p, " 最大重量:%d.%dkg", lbtokg1(plev * 15),lbtokg2(plev * 15));  break;
 #else
                case 10: sprintf(p, " max wgt %d", plev * 15);  break;
 #endif
-               case 11: sprintf(p, " %s%dd6", s_dam, plev / 2);  break;
-               case 12: sprintf(p, " %sd%d+%d", s_dam, plev * 3, plev * 3); break;
+               case 11: sprintf(p, " %s%dd6", KWD_DAM, plev / 2);  break;
+               case 12: sprintf(p, " %sd%d+%d", KWD_DAM, plev * 3, plev * 3); break;
                case 13: sprintf(p, _(" 行動:%ld回", " %ld acts."), (long int)(p_ptr->csp + 100-p_ptr->energy_need - 50)/100); break;
                }
                break;
@@ -578,19 +578,19 @@ void mindcraft_info(char *p, int use_mind, int power)
 
                switch (power)
                {
-               case 0:  sprintf(p, " %s%dd4", s_dam, 3 + ((plev - 1) / 5) + boost / 12); break;
+               case 0:  sprintf(p, " %s%dd4", KWD_DAM, 3 + ((plev - 1) / 5) + boost / 12); break;
                case 1:  break;
-               case 2:  sprintf(p, " %s%d+d30", s_dur, 30 + boost / 5); break;
-               case 3:  sprintf(p, " %s%dd5", s_dam, 5 + ((plev - 1) / 5) + boost / 10); break;
-               case 4:  sprintf(p, " %s%d+d20", s_dur, 20 + boost / 5); break;
+               case 2:  sprintf(p, " %s%d+d30", KWD_DURATION, 30 + boost / 5); break;
+               case 3:  sprintf(p, " %s%dd5", KWD_DAM, 5 + ((plev - 1) / 5) + boost / 10); break;
+               case 4:  sprintf(p, " %s%d+d20", KWD_DURATION, 20 + boost / 5); break;
                case 5:  break;
-               case 6:  sprintf(p, " %s%d+d%d", s_dur, 15 + boost / 7, plev / 2); break;
-               case 7:  sprintf(p, " %s%dd8", s_dam, 8 + ((plev - 5) / 4) + boost / 12); break;
-               case 8:  sprintf(p, " %s10d6+%d", s_dam, plev * 3 / 2 + boost * 3 / 5); break;
+               case 6:  sprintf(p, " %s%d+d%d", KWD_DURATION, 15 + boost / 7, plev / 2); break;
+               case 7:  sprintf(p, " %s%dd8", KWD_DAM, 8 + ((plev - 5) / 4) + boost / 12); break;
+               case 8:  sprintf(p, " %s10d6+%d", KWD_DAM, plev * 3 / 2 + boost * 3 / 5); break;
                case 9:  break;
                case 10: sprintf(p, _(" 最大%d体", " max %d"), 1+boost/100); break;
-               case 11: sprintf(p, " %s%d", s_dam, 100 + plev + boost); break;
-               case 12: sprintf(p, " %s%dd15", s_dam, 10 + plev / 2 + boost * 3 / 10); break;
+               case 11: sprintf(p, " %s%d", KWD_DAM, 100 + plev + boost); break;
+               case 12: sprintf(p, " %s%dd15", KWD_DAM, 10 + plev / 2 + boost * 3 / 10); break;
                case 13: sprintf(p, _(" 行動:%d+d16回", " %d+d16 acts"), 16+boost/20); break;
                }
                break;
@@ -601,25 +601,25 @@ void mindcraft_info(char *p, int use_mind, int power)
                {
                case 0:  break;
                case 1:  break;
-               case 2:  sprintf(p, " %s%dd4", s_dam,  3 + ((plev - 1) / 5) ); break;
-               case 3:  sprintf(p, " %s10", s_range); break;
+               case 2:  sprintf(p, " %s%dd4", KWD_DAM,  3 + ((plev - 1) / 5) ); break;
+               case 3:  sprintf(p, " %s10", KWD_SPHERE); break;
                case 4:  break;
-               case 5:  sprintf(p, " %s%d", s_range, plev *5); break;
-               case 6:  sprintf(p, " %s20+d20", s_dur);  break;
+               case 5:  sprintf(p, " %s%d", KWD_SPHERE, plev *5); break;
+               case 6:  sprintf(p, " %s20+d20", KWD_DURATION);  break;
                case 7:  break;
-               case 8:  sprintf(p, " %s%dd8", s_dam, 8+((plev -5)/4) ); break;
+               case 8:  sprintf(p, " %s%dd8", KWD_DAM, 8+((plev -5)/4) ); break;
                case 9:  break;
-               case 10: sprintf(p, " %s%dd8", s_dam, 11+(plev-5)/4 ); break;
+               case 10: sprintf(p, " %s%dd8", KWD_DAM, 11+(plev-5)/4 ); break;
                case 11: break;
-               case 12: sprintf(p, " %s20+d20", s_dur);  break;
-               case 13: sprintf(p, " %s150+d%d", s_dam, plev*2 ); break;
+               case 12: sprintf(p, " %s20+d20", KWD_DURATION);  break;
+               case 13: sprintf(p, " %s150+d%d", KWD_DAM, plev*2 ); break;
                case 14: break;
                case 15: break;
-               case 16: sprintf(p, " %s%d", s_range, plev/2 +10); break;
+               case 16: sprintf(p, " %s%d", KWD_SPHERE, plev/2 +10); break;
                case 17: break;
-               case 18: sprintf(p, " %s6+d6", s_dur);  break;
-               case 19: sprintf(p, " %s%d", s_dam, plev*11+5 ); break;
-               case 20: sprintf(p, " %s4+d4", s_dur);  break;
+               case 18: sprintf(p, " %s6+d6", KWD_DURATION);  break;
+               case 19: sprintf(p, " %s%d", KWD_DAM, plev*11+5 ); break;
+               case 20: sprintf(p, " %s4+d4", KWD_DURATION);  break;
                }
                break;
        }
@@ -629,24 +629,24 @@ void mindcraft_info(char *p, int use_mind, int power)
                {
                case 0:  break;
                case 1:  break;
-               case 2:  sprintf(p, " %s10", s_range); break;
+               case 2:  sprintf(p, " %s10", KWD_SPHERE); break;
                case 3:  break;
-               case 4:  sprintf(p, " %s%d", s_range , plev *5); break;
-               case 5:  sprintf(p, " %s30", s_range); break;
+               case 4:  sprintf(p, " %s%d", KWD_SPHERE , plev *5); break;
+               case 5:  sprintf(p, " %s30", KWD_SPHERE); break;
                case 6:  break;
                case 7:  break;
-               case 8:  sprintf(p, " %s20+d20", s_dur);  break;
-               case 9:  sprintf(p, " %s%d", s_dam, (50+plev)/2 ); break;
+               case 8:  sprintf(p, " %s20+d20", KWD_DURATION);  break;
+               case 9:  sprintf(p, " %s%d", KWD_DAM, (50+plev)/2 ); break;
                case 10: break;
                case 11: break;
                case 12: break;
                case 13: break;
                case 14: break;
                case 15: break;
-               case 16: sprintf(p, " %s%d+d%d", s_dur, plev/2, plev/2);  break;
-               case 17: sprintf(p, " %s%d*3", s_dam, (75+plev*2/3)/2 ); break;
-               case 18: sprintf(p, " %s%dd10", s_dam, 6+plev/8 ); break;
-               case 19: sprintf(p, " %s6+d6", s_dur);  break;
+               case 16: sprintf(p, " %s%d+d%d", KWD_DURATION, plev/2, plev/2);  break;
+               case 17: sprintf(p, " %s%d*3", KWD_DAM, (75+plev*2/3)/2 ); break;
+               case 18: sprintf(p, " %s%dd10", KWD_DAM, 6+plev/8 ); break;
+               case 19: sprintf(p, " %s6+d6", KWD_DURATION);  break;
                }
                break;
        }

diff --git a/src/mspells3.c b/src/mspells3.c
index 56a7434..5b4c947 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -93,7 +93,7 @@ static void learned_info(char *p, int power)
         case MS_BALL_MANA:
         case MS_BALL_DARK:
         case MS_STARBURST: 
-            set_bluemage_damage((power), plev, s_dam, p); break;
+            set_bluemage_damage((power), plev, KWD_DAM, p); break;
                case MS_DISPEL:
                        break;
         case MS_ROCKET:
@@ -129,9 +129,9 @@ static void learned_info(char *p, int power)
         case MS_BALL_POIS:
         case MS_BALL_NETHER:
         case MS_BALL_WATER:
-            set_bluemage_damage((power), plev, s_dam, p); break;
+            set_bluemage_damage((power), plev, KWD_DAM, p); break;
         case MS_DRAIN_MANA:
-            set_bluemage_damage((power), plev, s_heal, p); break;
+            set_bluemage_damage((power), plev, KWD_HEAL, p); break;
         case MS_MIND_BLAST:
         case MS_BRAIN_SMASH:
         case MS_CAUSE_1:
@@ -148,26 +148,26 @@ static void learned_info(char *p, int power)
         case MS_BOLT_PLASMA:
         case MS_BOLT_ICE: 
         case MS_MAGIC_MISSILE: 
-            set_bluemage_damage((power), plev, s_dam, p); break;
+            set_bluemage_damage((power), plev, KWD_DAM, p); break;
                case MS_SPEED:
-                       sprintf(p, " %sd%d+%d", s_dur, 20+plev, plev);
+                       sprintf(p, " %sd%d+%d", KWD_DURATION, 20+plev, plev);
                        break;
         case MS_HEAL:
-            set_bluemage_damage((power), plev, s_heal, p); break;
+            set_bluemage_damage((power), plev, KWD_HEAL, p); break;
                case MS_INVULNER:
-                       sprintf(p, " %sd7+7", s_dur);
+                       sprintf(p, " %sd7+7", KWD_DURATION);
                        break;
                case MS_BLINK:
-                       sprintf(p, " %s10", s_range);
+                       sprintf(p, " %s10", KWD_SPHERE);
                        break;
                case MS_TELEPORT:
-                       sprintf(p, " %s%d", s_range, plev * 5);
+                       sprintf(p, " %s%d", KWD_SPHERE, plev * 5);
                        break;
         case MS_PSY_SPEAR:
-            set_bluemage_damage((power), plev, s_dam, p); break;
+            set_bluemage_damage((power), plev, KWD_DAM, p); break;
                        break;
                case MS_RAISE_DEAD:
-                       sprintf(p, " %s5", s_range);
+                       sprintf(p, " %s5", KWD_SPHERE);
                        break;
                default:
                        break;

diff --git a/src/realm-chaos.c b/src/realm-chaos.c
index 64db7ad..a994114 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -184,7 +184,7 @@ concptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (desc) return _("モンスターにランダムな効果を与える。", "Fires something with random effects.");
 
                {
-                       if (info) return s_random;
+                       if (info) return KWD_RANDOM;
 
                        if (cast)
                        {
@@ -511,7 +511,7 @@ concptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (desc) return _("ランダムな属性の球やビームを発生させる。", "Generate random kind of balls or beams.");
 
                {
-                       if (info) return format("%s150 / 250", s_dam);
+                       if (info) return format("%s150 / 250", KWD_DAM);
 
                        if (cast)
                        {
@@ -576,7 +576,7 @@ concptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        "Fires rockets, mana balls and nuclear waste balls in all directions each unless you are not adjacent to any walls. Otherwise *destroys* huge area.");
 
                {
-                       if (info) return format("%s3 * 175", s_dam);
+                       if (info) return format("%s3 * 175", KWD_DAM);
 
                        if (cast)
                        {

diff --git a/src/realm-daemon.c b/src/realm-daemon.c
index f4821b7..4042dc7 100644 (file)
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -407,7 +407,7 @@ concptr do_daemon_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        int sides1 = plev * 2;
                        int sides2 = plev * 2;
 
-                       if (info) return format("%sd%d+d%d", s_dam, sides1, sides2);
+                       if (info) return format("%sd%d+d%d", KWD_DAM, sides1, sides2);
 
                        if (cast)
                        {
@@ -489,7 +489,7 @@ concptr do_daemon_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        int power = 20 + plev;
                        POSITION rad = 3 + plev / 20;
 
-                       if (info) return format("%s%d+%d", s_dam, dam / 2, dam / 2);
+                       if (info) return format("%s%d+%d", KWD_DAM, dam / 2, dam / 2);
 
                        if (cast)
                        {

diff --git a/src/realm-death.c b/src/realm-death.c
index 0d4f92a..136e198 100644 (file)
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -381,7 +381,7 @@ concptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (desc) return _("ランダムで様々な効果が起こる。", "Causes random effects.");
 
                {
-                       if (info) return s_random;
+                       if (info) return KWD_RANDOM;
 
                        if (cast)
                        {
@@ -450,7 +450,7 @@ concptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        HIT_POINT dam = 100;
 
-                       if (info) return format("%s3*%d", s_dam, dam);
+                       if (info) return format("%s3*%d", KWD_DAM, dam);
 
                        if (cast)
                        {

diff --git a/src/realm-nature.c b/src/realm-nature.c
index 9b36311..836a69e 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -48,7 +48,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        DICE_SID sides = 4;\r
                        POSITION range = plev / 6 + 2;\r
 \r
-                       if (info) return format("%s%dd%d %s%d", s_dam, dice, sides, s_rng, range);\r
+                       if (info) return format("%s%dd%d %s%d", KWD_DAM, dice, sides, KWD_RANGE, range);\r
 \r
                        if (cast)\r
                        {\r
@@ -549,7 +549,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        POSITION b_rad = 1 + plev / 12;\r
                        POSITION q_rad = 20 + plev / 2;\r
 \r
-                       if (info) return format("%s%d+%d", s_dam, d_dam, b_dam / 2);\r
+                       if (info) return format("%s%d+%d", KWD_DAM, d_dam, b_dam / 2);\r
 \r
                        if (cast)\r
                        {\r

diff --git a/src/realm-song.c b/src/realm-song.c
index 5119ca5..f88cfb8 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -619,7 +619,7 @@ concptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        DICE_SID m_sides = plev * 3;
                        DICE_SID e_sides = plev * 3;
 
-                       if (info) return format("%s1d%d+1d%d", s_dam, m_sides, e_sides);
+                       if (info) return format("%s1d%d+1d%d", KWD_DAM, m_sides, e_sides);
 
                        if (cont)
                        {

diff --git a/src/realm-trump.c b/src/realm-trump.c
index 6a153d0..53c42f9 100644 (file)
--- a/src/realm-trump.c
+++ b/src/realm-trump.c
@@ -65,7 +65,7 @@ concptr do_trump_spell(SPELL_IDX spell, BIT_FLAGS mode)
                if (desc) return _("カードの占いをする。", "Causes random effects.");
 
                {
-                       if (info) return s_random;
+                       if (info) return KWD_RANDOM;
 
                        if (cast)
                        {