[Refactor] #37353 dragonbreath_type 構造体と関連変数を cmd-activate.c/h へ移動．

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index 9e3850d..01a9798 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -31,6 +31,28 @@
 #include "grid.h"
 
 /*!
+ * @brief 装備耐性に準じたブレス効果の選択テーブル /
+ * Define flags, effect type, name for dragon breath activation
+ */
+const dragonbreath_type dragonbreath_info[] = {
+       { TR_RES_ACID, GF_ACID, _("酸", "acid") },
+       { TR_RES_ELEC, GF_ELEC, _("電撃", "lightning") },
+       { TR_RES_FIRE, GF_FIRE, _("火炎", "fire") },
+       { TR_RES_COLD, GF_COLD, _("冷気", "cold") },
+       { TR_RES_POIS, GF_POIS, _("毒", "poison") },
+       { TR_RES_LITE, GF_LITE, _("閃光", "light") },
+       { TR_RES_DARK, GF_DARK, _("暗黒", "dark") },
+       { TR_RES_SHARDS, GF_SHARDS, _("破片", "shard") },
+       { TR_RES_CONF, GF_CONFUSION, _("混乱", "confusion") },
+       { TR_RES_SOUND, GF_SOUND, _("轟音", "sound") },
+       { TR_RES_NEXUS, GF_NEXUS, _("因果混乱", "nexus") },
+       { TR_RES_NETHER, GF_NETHER, _("地獄", "nether") },
+       { TR_RES_CHAOS, GF_CHAOS, _("カオス", "chaos") },
+       { TR_RES_DISEN, GF_DISENCHANT, _("劣化", "disenchant") },
+       { 0, 0, NULL }
+};
+
+/*!
  * @brief アイテムの発動効果テーブル /
  * Define flags, levels, values of activations
  */

diff --git a/src/cmd-activate.h b/src/cmd-activate.h
index 6bdd7d4..df12f97 100644 (file)
--- a/src/cmd-activate.h
+++ b/src/cmd-activate.h
@@ -18,6 +18,13 @@ typedef struct {
 
 extern const activation_type activation_info[];
 
+typedef struct {
+       int flag;
+       int type;
+       concptr name;
+} dragonbreath_type;
+
+extern const dragonbreath_type dragonbreath_info[];
 
 /* Activation effects for random artifacts */
 #define ACT_SUNLIGHT            1

diff --git a/src/externs.h b/src/externs.h
index ccdbad8..9425e74 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -86,10 +86,8 @@ extern const concptr game_inscriptions[];
 extern const kamae kamae_shurui[MAX_KAMAE];
 extern const kamae kata_shurui[MAX_KATA];
 
-
 extern const concptr ident_info[];
 extern const byte feature_action_flags[FF_FLAG_MAX];
-extern const dragonbreath_type dragonbreath_info[];
 
 /* variable.c */
 extern const concptr copyright[5];

diff --git a/src/tables.c b/src/tables.c
index e298492..b176e61 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -2654,26 +2654,3 @@ const byte feature_action_flags[FF_FLAG_MAX] =
        0, /* GLASS */
 };
 
-
-/*!
- * @brief 装備耐性に準じたブレス効果の選択テーブル /
- * Define flags, effect type, name for dragon breath activation
- */
-const dragonbreath_type dragonbreath_info[] = {
-       { TR_RES_ACID, GF_ACID, _("酸", "acid") },
-       { TR_RES_ELEC, GF_ELEC, _("電撃", "lightning") },
-       { TR_RES_FIRE, GF_FIRE, _("火炎", "fire") },
-       { TR_RES_COLD, GF_COLD, _("冷気", "cold") },
-       { TR_RES_POIS, GF_POIS, _("毒", "poison") },
-       { TR_RES_LITE, GF_LITE, _("閃光", "light") },
-       { TR_RES_DARK, GF_DARK, _("暗黒", "dark") },
-       { TR_RES_SHARDS, GF_SHARDS, _("破片", "shard") },
-       { TR_RES_CONF, GF_CONFUSION, _("混乱", "confusion") },
-       { TR_RES_SOUND, GF_SOUND, _("轟音", "sound") },
-       { TR_RES_NEXUS, GF_NEXUS, _("因果混乱", "nexus") },
-       { TR_RES_NETHER, GF_NETHER, _("地獄", "nether") },
-       { TR_RES_CHAOS, GF_CHAOS, _("カオス", "chaos") },
-       { TR_RES_DISEN, GF_DISENCHANT, _("劣化", "disenchant") },
-       { 0, 0, NULL }
-};
-

diff --git a/src/types.h b/src/types.h
index 1a67320..bb979e3 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -93,8 +93,3 @@ typedef struct
 }
 feat_prob;
 
-typedef struct {
-       int flag;
-       int type;
-       concptr name;
-} dragonbreath_type;