[Refactor] #37353 a_info と artifact_type 構造体を artifact.h へ移動。

diff --git a/src/artifact.c b/src/artifact.c
index 74c03f6..e80566e 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -25,6 +25,13 @@
 #include "spells-object.h"
 #include "files.h"
 
+ /*
+  * The artifact arrays
+  */
+artifact_type *a_info;
+char *a_name;
+char *a_text;
+
 static bool has_extreme_damage_rate(object_type *o_ptr);
 static bool weakening_artifact(object_type *o_ptr);
 

diff --git a/src/artifact.h b/src/artifact.h
index 3bdcd88..a1a83f2 100644 (file)
--- a/src/artifact.h
+++ b/src/artifact.h
@@ -1,4 +1,59 @@
-/* artifact.c */
+#pragma once
+
+
+typedef struct artifact_type artifact_type;
+
+/*!
+ * @struct artifact_type
+ * @brief 固定アーティファクト情報の構造体 / Artifact structure.
+ * @details
+ * @note
+ * the save-file only writes "cur_num" to the savefile.
+ * "max_num" is always "1" (if that artifact "exists")
+ */
+struct artifact_type
+{
+       STR_OFFSET name;                        /*!< アーティファクト名(headerオフセット参照) / Name (offset) */
+       STR_OFFSET text;                        /*!< アーティファクト解説(headerオフセット参照) / Text (offset) */
+
+       OBJECT_TYPE_VALUE tval;         /*!< ベースアイテム大項目ID / Artifact type */
+       OBJECT_SUBTYPE_VALUE sval;      /*!< ベースアイテム小項目ID / Artifact sub type */
+
+       PARAMETER_VALUE pval;   /*!< pval修正値 / Artifact extra info */
+
+       HIT_PROB to_h;                  /*!< 命中ボーナス値 /  Bonus to hit */
+       HIT_POINT to_d;         /*!< ダメージボーナス値 / Bonus to damage */
+       ARMOUR_CLASS to_a;                      /*!< ACボーナス値 / Bonus to armor */
+
+       ARMOUR_CLASS ac;                        /*!< 上書きベースAC値 / Base armor */
+
+       DICE_NUMBER dd;
+       DICE_SID ds;    /*!< ダイス値 / Damage when hits */
+
+       WEIGHT weight;          /*!< 重量 / Weight */
+
+       PRICE cost;                     /*!< 基本価格 / Artifact "cost" */
+
+       BIT_FLAGS flags[TR_FLAG_SIZE];       /*! アイテムフラグ / Artifact Flags */
+
+       BIT_FLAGS gen_flags;            /*! アイテム生成フラグ / flags for generate */
+
+       DEPTH level;            /*! 基本生成階 / Artifact level */
+       RARITY rarity;          /*! レアリティ / Artifact rarity */
+
+       byte cur_num;           /*! 現在の生成数 / Number created (0 or 1) */
+       byte max_num;           /*! (未使用)最大生成数 / Unused (should be "1") */
+
+       FLOOR_IDX floor_id;      /*! アイテムを落としたフロアのID / Leaved on this location last time */
+
+       byte act_idx;           /*! 発動能力ID / Activative ability index */
+};
+
+extern artifact_type *a_info;
+extern char *a_name;
+extern char *a_text;
+
+/* artifact.c */
 extern bool create_artifact(object_type *o_ptr, bool a_scroll);
 extern int activation_index(object_type *o_ptr);
 extern const activation_type* find_activation_info(object_type *o_ptr);

diff --git a/src/birth.c b/src/birth.c
index 688222c..38a4ab3 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -15,6 +15,7 @@
 #include "util.h"
 #include "bldg.h"
 
+#include "artifact.h"
 #include "avatar.h"
 #include "history.h"
 #include "monsterrace-hook.h"

diff --git a/src/externs.h b/src/externs.h
index ce38d18..fedb549 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -256,9 +256,6 @@ extern char *f_tag;
 extern object_kind *k_info;
 extern char *k_name;
 extern char *k_text;
-extern artifact_type *a_info;
-extern char *a_name;
-extern char *a_text;
 extern ego_item_type *e_info;
 extern char *e_name;
 extern char *e_text;

diff --git a/src/floor-save.c b/src/floor-save.c
index 02bafa4..b2dde05 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "artifact.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "floor-generate.h"

diff --git a/src/floor-streams.c b/src/floor-streams.c
index 226c64a..56cb268 100644 (file)
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -18,6 +18,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "artifact.h"
 #include "floor-generate.h"
 #include "floor.h"
 #include "floor-streams.h"

diff --git a/src/init.c b/src/init.c
index 59cf6ea..ee3c214 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -35,6 +35,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "artifact.h"
 #include "init.h"
 #include "quest.h"
 #include "trap.h"

diff --git a/src/object-flavor.c b/src/object-flavor.c
index 59f756a..4361807 100644 (file)
--- a/src/object-flavor.c
+++ b/src/object-flavor.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "artifact.h"
 #include "player-status.h"
 #include "shoot.h"
 #include "object-hook.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 12473a5..3352e86 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -15,6 +15,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "artifact.h"
 #include "floor.h"
 #include "bldg.h"
 #include "birth.h"

diff --git a/src/rumor.c b/src/rumor.c
index e5d2e03..5f6824c 100644 (file)
--- a/src/rumor.c
+++ b/src/rumor.c
@@ -3,6 +3,7 @@
 
 #include "files.h"
 #include "object-flavor.h"
+#include "artifact.h"
 
 /*
  * Display a rumor and apply its effects

diff --git a/src/save.c b/src/save.c
index 80223ab..ad2717e 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -14,6 +14,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "artifact.h"
 #include "sort.h"
 #include "quest.h"
 #include "store.h"

diff --git a/src/sort.c b/src/sort.c
index 9105ecb..f91cbc4 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -2,6 +2,7 @@
 #include "sort.h"
 #include "floor.h"
 #include "quest.h"
+#include "artifact.h"
 
 /*
  * Angband sorting algorithm -- quick sort in place

diff --git a/src/spells2.c b/src/spells2.c
index 6174ff9..e7830c3 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -14,6 +14,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "artifact.h"
 #include "cmd-pet.h"
 #include "floor.h"
 #include "grid.h"

diff --git a/src/types.h b/src/types.h
index 6bb10bb..6c86b1f 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -112,56 +112,6 @@ struct object_kind
 };
 
 
-
-typedef struct artifact_type artifact_type;
-
-/*!
- * @struct artifact_type
- * @brief 固定アーティファクト情報の構造体 / Artifact structure.
- * @details
- * @note
- * the save-file only writes "cur_num" to the savefile.
- * "max_num" is always "1" (if that artifact "exists")
- */
-struct artifact_type
-{
-       STR_OFFSET name;                        /*!< アーティファクト名(headerオフセット参照) / Name (offset) */
-       STR_OFFSET text;                        /*!< アーティファクト解説(headerオフセット参照) / Text (offset) */
-
-       OBJECT_TYPE_VALUE tval;         /*!< ベースアイテム大項目ID / Artifact type */
-       OBJECT_SUBTYPE_VALUE sval;      /*!< ベースアイテム小項目ID / Artifact sub type */
-
-       PARAMETER_VALUE pval;   /*!< pval修正値 / Artifact extra info */
-
-       HIT_PROB to_h;                  /*!< 命中ボーナス値 /  Bonus to hit */
-       HIT_POINT to_d;         /*!< ダメージボーナス値 / Bonus to damage */
-       ARMOUR_CLASS to_a;                      /*!< ACボーナス値 / Bonus to armor */
-
-       ARMOUR_CLASS ac;                        /*!< 上書きベースAC値 / Base armor */
-
-       DICE_NUMBER dd;
-       DICE_SID ds;    /*!< ダイス値 / Damage when hits */
-
-       WEIGHT weight;          /*!< 重量 / Weight */
-
-       PRICE cost;                     /*!< 基本価格 / Artifact "cost" */
-
-       BIT_FLAGS flags[TR_FLAG_SIZE];       /*! アイテムフラグ / Artifact Flags */
-
-       BIT_FLAGS gen_flags;            /*! アイテム生成フラグ / flags for generate */
-
-       DEPTH level;            /*! 基本生成階 / Artifact level */
-       RARITY rarity;          /*! レアリティ / Artifact rarity */
-
-       byte cur_num;           /*! 現在の生成数 / Number created (0 or 1) */
-       byte max_num;           /*! (未使用)最大生成数 / Unused (should be "1") */
-
-       FLOOR_IDX floor_id;      /*! アイテムを落としたフロアのID / Leaved on this location last time */
-
-       byte act_idx;           /*! 発動能力ID / Activative ability index */
-};
-
-
 /*
  * Information about "ego-items".
  */

diff --git a/src/variable.c b/src/variable.c
index 292acad..dce75b3 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -565,13 +565,6 @@ char *k_name;
 char *k_text;
 
 /*
- * The artifact arrays
- */
-artifact_type *a_info;
-char *a_name;
-char *a_text;
-
-/*
  * The ego-item arrays
  */
 ego_item_type *e_info;

diff --git a/src/wizard1.c b/src/wizard1.c
index 400fc33..31ffbfb 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "artifact.h"
 #include "sort.h"
 #include "store.h"
 #include "monster.h"