[Refactor] #37353 fake_spell_flags を cmd-spell.h へ移動．

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index 912cc9e..8466449 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -38,6 +38,19 @@
 #include "floor.h"
 #include "autopick.h"
 
+ /*!
+  * 魔法領域フラグ管理テーブル /
+  * Zangband uses this array instead of the spell flags table, as there
+  * are 5 realms of magic, each with 4 spellbooks and 8 spells per book -- TY
+  */
+const u32b fake_spell_flags[4] =
+{
+       0x000000ff,
+       0x0000ff00,
+       0x00ff0000,
+       0xff000000
+};
+
 /*!
  * @brief
  * 魔法の効果を「キャプション:ダイス＋定数値」のフォーマットで出力する / Generate dice info string such as "foo 2d10"

diff --git a/src/cmd-spell.h b/src/cmd-spell.h
index fc87ca6..2bd5530 100644 (file)
--- a/src/cmd-spell.h
+++ b/src/cmd-spell.h
@@ -1,10 +1,14 @@
-#define KWD_DAM      _("損傷:", "dam ")
+#pragma once
+
+#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 const u32b fake_spell_flags[4];
+
 extern concptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode);
 
 extern concptr info_string_dice(concptr str, DICE_NUMBER dice, DICE_SID sides, int base);

diff --git a/src/externs.h b/src/externs.h
index 5821d87..36edb67 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -67,7 +67,6 @@ extern const byte adj_con_mhp[];
 extern const byte adj_chr_chm[];
 extern const byte extract_energy[200];
 
-extern const u32b fake_spell_flags[4];
 extern const concptr realm_names[];
 #ifdef JP
 extern const concptr E_realm_names[];

diff --git a/src/object2.c b/src/object2.c
index 2637dc1..7915c64 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -17,6 +17,7 @@
 #include "object.h"
 
 #include "cmd-dump.h"
+#include "cmd-spell.h"
 #include "spells.h"
 #include "dungeon.h"
 #include "floor.h"

diff --git a/src/tables.c b/src/tables.c
index a3f97ae..3d9e0b6 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1089,19 +1089,6 @@ const byte extract_energy[200] =
        /* Fast */    49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
 };
 
-/*!
- * 魔法領域フラグ管理テーブル /
- * Zangband uses this array instead of the spell flags table, as there
- * are 5 realms of magic, each with 4 spellbooks and 8 spells per book -- TY
- */
-const u32b fake_spell_flags[4]=
-{
-       0x000000ff,
-       0x0000ff00,
-       0x00ff0000,
-       0xff000000
-};
-
 #ifdef JP
 /*!
  * 領域魔法名称