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

diff --git a/src/realm-chaos.c b/src/realm-chaos.c
index 7aedbfa..2eecfe0 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -15,8 +15,8 @@ concptr do_chaos_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool info = (mode == SPELL_INFO) ? TRUE : FALSE;
        bool cast = (mode == SPELL_CAST) ? TRUE : FALSE;
 
-       static const char s_dam[] = _("損傷:", "dam ");
-       static const char s_random[] = _("ランダム", "random");
+       const concptr s_dam = _("損傷:", "dam ");
+       const concptr s_random = _("ランダム", "random");
 
        DIRECTION dir;
        PLAYER_LEVEL plev = p_ptr->lev;

diff --git a/src/realm-daemon.c b/src/realm-daemon.c
index d9a3c55..9b01618 100644 (file)
--- a/src/realm-daemon.c
+++ b/src/realm-daemon.c
@@ -15,7 +15,8 @@ concptr do_daemon_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
        bool info = (mode == SPELL_INFO) ? TRUE : FALSE;
        bool cast = (mode == SPELL_CAST) ? TRUE : FALSE;
-       static const char s_dam[] = _("損傷:", "dam ");
+
+       const concptr s_dam = _("損傷:", "dam ");
 
        DIRECTION dir;
        PLAYER_LEVEL plev = p_ptr->lev;

diff --git a/src/realm-death.c b/src/realm-death.c
index 55e618b..7113726 100644 (file)
--- a/src/realm-death.c
+++ b/src/realm-death.c
@@ -16,8 +16,8 @@ concptr do_death_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool info = (mode == SPELL_INFO) ? TRUE : FALSE;
        bool cast = (mode == SPELL_CAST) ? TRUE : FALSE;
 
-       static const char s_dam[] = _("損傷:", "dam ");
-       static const char s_random[] = _("ランダム", "random");
+       const concptr s_dam = _("損傷:", "dam ");
+       const concptr s_random = _("ランダム", "random");
 
        DIRECTION dir;
        PLAYER_LEVEL plev = p_ptr->lev;

diff --git a/src/realm-nature.c b/src/realm-nature.c
index 3654293..543608d 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -15,8 +15,8 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool info = (mode == SPELL_INFO) ? TRUE : FALSE;\r
        bool cast = (mode == SPELL_CAST) ? TRUE : FALSE;\r
 \r
-       static const char s_dam[] = _("損傷:", "dam ");\r
-       static const char s_rng[] = _("射程", "rng ");\r
+       const concptr s_dam = _("損傷:", "dam ");\r
+       const concptr s_rng = _("射程", "rng ");\r
 \r
        DIRECTION dir;\r
        PLAYER_LEVEL plev = p_ptr->lev;\r

diff --git a/src/realm-song.c b/src/realm-song.c
index b9f8826..21d9419 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -73,7 +73,8 @@ concptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool fail = (mode == SPELL_FAIL) ? TRUE : FALSE;
        bool cont = (mode == SPELL_CONT) ? TRUE : FALSE;
        bool stop = (mode == SPELL_STOP) ? TRUE : FALSE;
-       static const char s_dam[] = _("損傷:", "dam ");
+
+       const concptr s_dam = _("損傷:", "dam ");
 
        DIRECTION dir;
        PLAYER_LEVEL plev = p_ptr->lev;

diff --git a/src/realm-trump.c b/src/realm-trump.c
index f9c0291..59db0bd 100644 (file)
--- a/src/realm-trump.c
+++ b/src/realm-trump.c
@@ -15,7 +15,8 @@ concptr do_trump_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool info = (mode == SPELL_INFO) ? TRUE : FALSE;
        bool cast = (mode == SPELL_CAST) ? TRUE : FALSE;
        bool fail = (mode == SPELL_FAIL) ? TRUE : FALSE;
-       static const char s_random[] = _("ランダム", "random");
+
+       const concptr s_random = _("ランダム", "random");
 
        DIRECTION dir;
        PLAYER_LEVEL plev = p_ptr->lev;