Merge branch 'feature/bounty-endless-loop' into develop

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index 7fc0c20..56ecf3c 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -63,6 +63,13 @@
 #include "locale/japanese.h"
 #endif
 
+concptr KWD_DAM = _("損傷:", "dam ");
+concptr KWD_RANGE = _("射程:", "rng ");
+concptr KWD_DURATION = _("期間:", "dur ");
+concptr KWD_SPHERE = _("範囲:", "range ");
+concptr KWD_HEAL = _("回復:", "heal ");
+concptr KWD_RANDOM = _("ランダム", "random");
+
 /*!
  * 魔法領域フラグ管理テーブル /
  * Zangband uses this array instead of the spell flags table, as there

diff --git a/src/cmd-action/cmd-spell.h b/src/cmd-action/cmd-spell.h
index a962b65..0208a16 100644 (file)
--- a/src/cmd-action/cmd-spell.h
+++ b/src/cmd-action/cmd-spell.h
@@ -2,12 +2,12 @@
 
 #include "system/angband.h"
 
-#define KWD_DAM _("損傷:", "dam ")
-#define KWD_RANGE    _("射程:", "rng ")
-#define KWD_DURATION _("期間:", "dur ")
-#define KWD_SPHERE   _("範囲:", "range ")
-#define KWD_HEAL     _("回復:", "heal ")
-#define KWD_RANDOM   _("ランダム", "random")
+extern concptr KWD_DAM;
+extern concptr KWD_RANGE;
+extern concptr KWD_DURATION;
+extern concptr KWD_SPHERE;
+extern concptr KWD_HEAL;
+extern concptr KWD_RANDOM;
 
 extern const u32b fake_spell_flags[4];