[Refactor] #37353 ART_* を artifact.h へ分離。 / Separate ART_* to artifact.h.

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index b6b4663..93b903d 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -173,6 +173,7 @@
     <ClCompile Include="..\..\src\cmd-usestaff.c" />\r
     <ClCompile Include="..\..\src\cmd-zaprod.c" />\r
     <ClCompile Include="..\..\src\cmd-zapwand.c" />\r
+    <ClInclude Include="..\..\src\artifact.h" />\r
     <ClInclude Include="..\..\src\chest.h" />\r
     <ClInclude Include="..\..\src\cmd-item.h" />\r
     <ClInclude Include="..\..\src\cmd-magiceat.h" />\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 1430792..924375a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,9 @@ AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS = hengband
 
 hengband_SOURCES = \
-       artifact.c angband.h autopick.c avatar.c birth.c bldg.c cave.c chest.c chest.h chuukei.c \
+       artifact.c artifact.h \
+       \
+       angband.h autopick.c avatar.c birth.c bldg.c cave.c chest.c chest.h chuukei.c \
        cmd1.c cmd2.c cmd4.c cmd5.c cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \
        cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h cmd-pet.c cmd-pet.h \
        cmd-quaff.c cmd-quaff.h cmd-read.c cmd-read.h cmd-spell.c cmd-spell.h \

diff --git a/src/artifact.c b/src/artifact.c
index a79048c..3e0eead 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "cmd-activate.h"
 #include "object-curse.h"
+#include "artifact.h"
 
 static bool has_extreme_damage_rate(object_type *o_ptr);
 static bool weakening_artifact(object_type *o_ptr);

diff --git a/src/bldg.c b/src/bldg.c
index 4579f2f..deee15b 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -22,6 +22,7 @@
 
 #include "mutation.h"
 #include "quest.h"
+#include "artifact.h"
 
 /*!
  * ループ中で / hack as in leave_store in store.c

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index a316fb6..85e8c53 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -12,6 +12,7 @@
 #include "spells-summon.h"
 #include "sort.h"
 #include "projection.h"
+#include "artifact.h"
 
 /*!
 * @brief ペット入りモンスターボールをソートするための比較関数

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 56b4bf4..c217fc3 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -24,6 +24,7 @@
 #include "object-hook.h"
 #include "sort.h"
 #include "quest.h"
+#include "artifact.h"
 
 
 /*!

diff --git a/src/cmd-read.c b/src/cmd-read.c
index c408a3d..2d359d5 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -9,6 +9,7 @@
 #include "angband.h"\r
 #include "object-hook.h"\r
 #include "spells-summon.h"\r
+#include "artifact.h"\r
 \r
 /*!\r
  * @brief 巻物を読むコマンドのサブルーチン\r

diff --git a/src/cmd1.c b/src/cmd1.c
index 04c8c94..99e83e1 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -144,6 +144,7 @@
 #include "trap.h"
 #include "projection.h"
 #include "quest.h"
+#include "artifact.h"
 
 
 

diff --git a/src/cmd2.c b/src/cmd2.c
index 982ba8e..6818c7f 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -19,6 +19,7 @@
 #include "spells-summon.h"
 #include "monster-status.h"
 #include "quest.h"
+#include "artifact.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理

diff --git a/src/cmd4.c b/src/cmd4.c
index 2596748..cc49f7d 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -47,6 +47,7 @@
 #include "mutation.h"
 #include "quest.h"
 #include "store.h"
+#include "artifact.h"
 
 
 /*

diff --git a/src/defines.h b/src/defines.h
index 1c67b68..e4ef1c0 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -965,268 +965,6 @@
 #define F_LIT_MAX      3
 
 
-/*** Artifact indexes (see "lib/edit/a_info.txt") ***/
-
-/* Lites */
-#define ART_GALADRIEL            1
-#define ART_ELENDIL              2
-#define ART_JUDGE                3
-#define ART_EDISON               7
-#define ART_PALANTIR             15
-#define ART_STONE_LORE           17
-#define ART_FLY_STONE            147
-#define ART_ORB_OF_FATE          245 
-/* Amulets */
-#define ART_CARLAMMAS            4
-#define ART_INGWE                5
-#define ART_DWARVES              6
-#define ART_FARAMIR              18
-#define ART_BOROMIR              143
-#define ART_MAGATAMA             149
-#define ART_INROU                166
-#define ART_NIGHT                215
-#define ART_SACRED_KNIGHTS       217
-#define ART_HELL                 218
-#define ART_CHARMED              219
-#define ART_GOGO                 220
-
-/* Rings */
-#define ART_FRAKIR               8
-#define ART_TULKAS               9
-#define ART_NARYA               10
-#define ART_NENYA               11
-#define ART_VILYA               12
-#define ART_POWER               13
-#define ART_AHO                 14
-
-/* Dragon Scale */
-#define ART_RAZORBACK           129
-#define ART_BLADETURNER         130
-#define ART_SEIRYU              201
-
-/* Hard Armour */
-#define ART_SOULKEEPER          19
-#define ART_ISILDUR             20
-#define ART_ROHIRRIM            21
-#define ART_LOHENGRIN           22
-#define ART_JULIAN              23
-#define ART_ARVEDUI             24
-#define ART_CASPANION           25
-#define ART_GILES               168
-#define ART_MORLOK              203
-#define ART_VETERAN             206
-
-/* Soft Armour */
-#define ART_SHIVA_JACKET        26
-#define ART_HITHLOMIR           27
-#define ART_THALKETTOTH         28
-#define ART_HIMRING             127
-#define ART_ICANUS              131
-#define ART_NAMAKE_ARMOR        183
-#define ART_GHB                 192
-#define ART_DASAI               200
-#define ART_KESHO               204
-#define ART_MILIM               246
-
-/* Shields */
-#define ART_THORIN              30
-#define ART_CELEGORM            31
-#define ART_ANARION             32
-#define ART_GIL_GALAD           138
-#define ART_YENDOR              141
-#define ART_YATA                151
-#define ART_EARENDIL            186
-#define ART_PERSEUS             197
-
-/* Helms and Crowns */
-#define ART_INDRA               33
-#define ART_CHAOS               34
-#define ART_BERUTHIEL           35
-#define ART_THRANDUIL           36
-#define ART_THENGEL             37
-#define ART_HAMMERHAND          38
-#define ART_DOR                 39
-#define ART_HOLHENNETH          40
-#define ART_TERROR              41
-#define ART_AMBER               42
-#define ART_NUMENOR             132
-#define ART_STONEMASK           146
-
-/* Cloaks */
-#define ART_JACK                43
-#define ART_COLLUIN             44
-#define ART_HOLCOLLETH          45
-#define ART_THINGOL             46
-#define ART_THORONGIL           47
-#define ART_COLANNON            48
-#define ART_LUTHIEN             49
-#define ART_TUOR                50
-#define ART_MOOK                205
-#define ART_HEAVENLY_MAIDEN     233
-
-/* Gloves */
-#define ART_CAMBELEG            52
-#define ART_CAMMITHRIM          53
-#define ART_PAURHACH            54
-#define ART_CORWIN              55
-#define ART_PAURAEGEN           56
-#define ART_PAURNEN             57
-#define ART_THANOS              58
-#define ART_FINGOLFIN           59
-#define ART_PAURNIMMEN          185
-
-/* Boots */
-#define ART_FEANOR              60
-#define ART_FLORA               61
-#define ART_THROR               62
-#define ART_SHIVA_BOOTS         63
-#define ART_GLASS               165
-#define ART_GETA                210
-
-/* Digging */
-#define ART_NAIN                211
-
-/* Swords */
-#define ART_MAEDHROS            64
-#define ART_CAINE               65
-#define ART_NARTHANC            66
-#define ART_NIMTHANC            67
-#define ART_DETHANC             68
-#define ART_RILIA               69
-#define ART_FIONA               70
-#define ART_CALRIS              71
-#define ART_GRAYSWANDIR         72
-#define ART_GLAMDRING           73
-#define ART_NOTHUNG             74
-#define ART_ORCRIST             75
-#define ART_GURTHANG            76
-#define ART_ZARCUTHRA           77
-#define ART_TWILIGHT            78
-#define ART_GONDRICAM           79
-#define ART_CRISDURIAN          80
-#define ART_AGLARANG            81
-#define ART_RINGIL              82
-#define ART_ANDURIL             83
-#define ART_WEREWINDLE          84
-#define ART_CHAINSWORD          85
-#define ART_FORASGIL            86
-#define ART_CARETH              87
-#define ART_STING               88
-#define ART_SOULSWORD           89
-#define ART_MERLIN              90
-#define ART_DOOMCALLER          91
-#define ART_VORPAL_BLADE        92
-#define ART_SLAYER              123
-#define ART_KUSANAGI            128
-#define ART_HURIN               133
-#define ART_AZAGHAL             135
-#define ART_NOVA                137
-#define ART_CHARIOT             140
-#define ART_WORPAL_BLADE        142
-#define ART_MURAMASA            144
-#define ART_ZANTETSU            150
-#define ART_SOULCRUSH           154
-#define ART_FALIS               155
-#define ART_HRUNTING            156
-#define ART_ANUBIS              158
-#define ART_GURENKI             160
-#define ART_TAILBITER           167
-#define ART_MUSASI_KATANA       171
-#define ART_MUSASI_WAKIZASI     172
-#define ART_QUICKTHORN          174
-#define ART_TINYTHORN           175
-#define ART_EXCALIBUR           176
-#define ART_EXCALIPUR           177
-#define ART_EXCALIBUR_J         179
-#define ART_ARUNRUTH            184
-#define ART_HAKABUSA            189
-#define ART_STORMBRINGER        190
-#define ART_NARSIL              191
-#define ART_KANNU               193
-#define ART_GRIMTOOTH           196
-#define ART_KAMUI               198
-#define ART_GOURYU              207
-#define ART_EOWYN               216
-#define ART_NANACHO             248
-#define ART_ROBINTON            251
-
-/* Polearms */
-#define ART_THEODEN             93
-#define ART_PAIN                94
-#define ART_OSONDIR             95
-#define ART_TIL                 96
-#define ART_RUNESPEAR           97
-#define ART_DESTINY             98
-#define ART_HAGEN               99
-#define ART_EORLINGAS           100
-#define ART_DURIN               101
-#define ART_EONWE               102
-#define ART_BALLI               103
-#define ART_LOTHARANG           104
-#define ART_DWARVES_AXE         105
-#define ART_BARUKKHELED         106
-#define ART_WRATH               107
-#define ART_ULMO                108
-#define ART_AVAVIR              109
-#define ART_BENKEI              152
-#define ART_TAIKOBO             159
-#define ART_TONBO               161
-#define ART_GAEBOLG             163
-#define ART_ARRYU               164
-#define ART_AEGLOS              187
-#define ART_BLOOD               199
-#define ART_NUMAHOKO            202
-
-/* The sword of the Dawn */
-#define ART_DAWN                110
-
-/* Hafted */
-#define ART_GROND               111
-#define ART_TOTILA              112
-#define ART_THUNDERFIST         113
-#define ART_BLOODSPIKE          114
-#define ART_FIRESTAR            115
-#define ART_TARATOL             116
-#define ART_AULE                117
-#define ART_NAR                 118
-#define ART_ERIRIL              119
-#define ART_GANDALF             120
-#define ART_DEATHWREAKER        121
-#define ART_TURMIL              122
-#define ART_MJOLLNIR            136
-#define ART_WINBLOWS            139
-#define ART_XIAOLONG            145
-#define ART_NYOIBOU             157
-#define ART_JONES               162
-#define ART_HYOUSIGI            169
-#define ART_MATOI               170
-#define ART_IRON_BALL           173
-#define ART_SAMSON              178
-#define ART_NAMAKE_HAMMER       181
-#define ART_BOLISHOI            188
-#define ART_SHUTEN_DOJI         194
-#define ART_G_HAMMER            195
-#define ART_AEGISFANG           208
-#define ART_HERMIT              209
-#define ART_GOTHMOG             212
-#define ART_JIZO                213
-#define ART_FUNDIN              214
-#define ART_AESCULAPIUS         225
-
-/* Bows */
-#define ART_BELTHRONDING        124
-#define ART_BARD                125
-#define ART_BRAND               126
-#define ART_CRIMSON             16
-#define ART_BUCKLAND            134
-#define ART_YOICHI              148
-#define ART_HARAD               180
-#define ART_NAMAKE_BOW          182
-#define ART_ROBIN_HOOD          221
-#define ART_HELLFIRE            222
-
-/* Arrows */
-#define ART_BARD_ARROW          153
 
 /*** Ego-Item indexes (see "lib/edit/e_info.txt") ***/
 

diff --git a/src/dungeon.c b/src/dungeon.c
index 9c3712c..23a7788 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -30,6 +30,7 @@
 #include "world.h"
 #include "mutation.h"
 #include "quest.h"
+#include "artifact.h"
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/

diff --git a/src/files.c b/src/files.c
index 0eb9f30..a196158 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -20,6 +20,7 @@
 #include "mutation.h"
 #include "quest.h"
 #include "store.h"
+#include "artifact.h"
 
 
 /*

diff --git a/src/load.c b/src/load.c
index aac7f1d..4a40e07 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -46,6 +46,7 @@
 #include "mutation.h"
 #include "quest.h"
 #include "store.h"
+#include "artifact.h"
 
 
 /*

diff --git a/src/melee1.c b/src/melee1.c
index fb192db..baeefce 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "artifact.h"
 #include "cmd-pet.h"
 #include "player-damage.h"
 #include "monsterrace-hook.h"

diff --git a/src/monster-status.c b/src/monster-status.c
index 16650a2..538485d 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -4,6 +4,7 @@
 #include "spells-summon.h"
 #include "monsterrace-hook.h"
 #include "object-curse.h"
+#include "artifact.h"
 
 
 

diff --git a/src/monster1.c b/src/monster1.c
index c6768bf..da6e3e3 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -18,6 +18,7 @@
 #include "monster.h"
 #include "spells-summon.h"
 #include "quest.h"
+#include "artifact.h"
 
 
 /*

diff --git a/src/mspells4.c b/src/mspells4.c
index 666a17e..6a966e8 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -9,6 +9,7 @@
 #include "angband.h"
 #include "projection.h"
 #include "spells-summon.h"
+#include "artifact.h"
 
 /*!
 * @brief モンスターIDを取り、モンスター名をm_nameに代入する /

diff --git a/src/object-hook.c b/src/object-hook.c
index 8f11470..cbf3490 100644 (file)
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -1,6 +1,7 @@
 
 #include "angband.h"
 #include "object-hook.h"
+#include "artifact.h"
 
 /*!
 * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/

diff --git a/src/object1.c b/src/object1.c
index 7b43370..719b0b4 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "artifact.h"
 
 #if defined(MACINTOSH) || defined(MACH_O_CARBON)
 #ifdef verify

diff --git a/src/object2.c b/src/object2.c
index d1a604a..939a52b 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -14,6 +14,7 @@
 #include "angband.h"
 #include "object-hook.h"
 #include "object-curse.h"
+#include "artifact.h"
 
 static void one_sustain(object_type *o_ptr);
 

diff --git a/src/player-damage.c b/src/player-damage.c
index 92601f1..5744f31 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "player-damage.h"
+#include "artifact.h"
 
 
 /*!

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 4c43059..869d61b 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -3,6 +3,7 @@
 #include "melee.h"
 #include "monsterrace-hook.h"
 #include "projection.h"
+#include "artifact.h"
 
 /*!
 * @brief 剣術の各処理を行う

diff --git a/src/shoot.c b/src/shoot.c
index 4e194c5..2e0e9e2 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -1,6 +1,7 @@
 #include "angband.h"
 #include "projection.h"
 #include "monster-status.h"
+#include "artifact.h"
 
 /*!
  * @brief 矢弾を射撃した際のスレイ倍率をかけた結果を返す /

diff --git a/src/spells1.c b/src/spells1.c
index 0af271b..122ea25 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -27,6 +27,7 @@
 #include "projection.h"
 #include "mutation.h"
 #include "rooms.h"
+#include "artifact.h"
 
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */

diff --git a/src/spells3.c b/src/spells3.c
index 367d9c8..582c359 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -19,6 +19,7 @@
 #include "projection.h"
 #include "spells-summon.h"
 #include "quest.h"
+#include "artifact.h"
 
 
 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */

diff --git a/src/trap.c b/src/trap.c
index 228c388..effda36 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -5,6 +5,7 @@
 #include "projection.h"\r
 #include "spells-summon.h"\r
 #include "quest.h"\r
+#include "artifact.h"\r
 \r
 static s16b normal_traps[MAX_NORMAL_TRAPS];\r
 \r

diff --git a/src/xtra1.c b/src/xtra1.c
index bb56fbe..e9f1672 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "world.h"
 #include "quest.h"
+#include "artifact.h"
 
 /*!
  * @brief 現在の修正後能力値を3～17及び18/xxx形式に変換する / Converts stat num into a six-char (right justified) string