[Refactor] #37353 autopick.h を作成して関連構造体と変数を移動．

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 965ff78..2232e4c 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -192,6 +192,7 @@
     <ClCompile Include="..\..\src\cmd-zaprod.c" />\r
     <ClCompile Include="..\..\src\cmd-zapwand.c" />\r
     <ClInclude Include="..\..\src\artifact.h" />\r
+    <ClInclude Include="..\..\src\autopick.h" />\r
     <ClInclude Include="..\..\src\avatar.h" />\r
     <ClInclude Include="..\..\src\birth.h" />\r
     <ClInclude Include="..\..\src\bldg.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index c6d6042..97bc3a3 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -623,6 +623,9 @@
     <ClInclude Include="..\..\src\monsterrace.h">
       <Filter>monster</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\autopick.h">
+      <Filter>object</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index ad60938..53598bc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = hengband
 hengband_SOURCES = \
        artifact.c artifact.h \
        \
-       angband.h autopick.c \
+       angband.h autopick.c autopick.h\
        \
        avatar.h avatar.c birth.c birth.h \
        \

diff --git a/src/autopick.c b/src/autopick.c
index a77f1e9..bf7a4f1 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "autopick.h"
 
 #include "mind.h"
 
@@ -216,6 +217,13 @@ static GAME_TEXT KEY_BOOTS[] = "boots";
 
 
 /*
+ * 自動拾い/破壊設定のリストに関する変数 / List for auto-picker/destroyer entries
+ */
+int max_autopick = 0; /*!< 現在登録している自動拾い/破壊設定の数 */
+int max_max_autopick = 0; /*!< 自動拾い/破壊設定の限界数 */
+autopick_type *autopick_list = NULL; /*!< 自動拾い/破壊設定構造体のポインタ配列 */
+
+/*
  * A function to create new entry
  */
 static bool autopick_new_entry(autopick_type *entry, concptr str, bool allow_default)

diff --git a/src/autopick.h b/src/autopick.h
new file mode 100644 (file)
index 0000000..e7893c3
--- /dev/null
+++ b/src/autopick.h
@@ -0,0 +1,32 @@
+#pragma once
+
+/*!
+ * @struct autopick_type
+ * @brief 自動拾い/破壊設定データの構造体 / A structure type for entry of auto-picker/destroyer
+ */
+typedef struct {
+       concptr name;          /*!< 自動拾い/破壊定義の名称一致基準 / Items which have 'name' as part of its name match */
+       concptr insc;          /*!< 対象となったアイテムに自動で刻む内容 / Items will be auto-inscribed as 'insc' */
+       BIT_FLAGS flag[2];       /*!< キーワードに関する汎用的な条件フラグ / Misc. keyword to be matched */
+       byte action;        /*!< 対象のアイテムを拾う/破壊/放置するかの指定フラグ / Auto-pickup or Destroy or Leave items */
+       byte dice;          /*!< 武器のダイス値基準値 / Weapons which have more than 'dice' dice match */
+       byte bonus;         /*!< アイテムのボーナス基準値 / Items which have more than 'bonus' magical bonus match */
+} autopick_type;
+
+/*
+ *  List for auto-picker/destroyer entries
+ */
+extern int max_autopick;
+extern int max_max_autopick;
+extern autopick_type *autopick_list;
+
+/* autopick.c */
+extern void autopick_load_pref(bool disp_mes);
+extern errr process_autopick_file_command(char *buf);
+extern concptr autopick_line_from_entry(autopick_type *entry);
+extern int is_autopick(object_type *o_ptr);
+extern void autopick_alter_item(INVENTORY_IDX item, bool destroy);
+extern void autopick_delayed_alter(void);
+extern void autopick_pickup_items(grid_type *g_ptr);
+extern bool autopick_autoregister(object_type *o_ptr);
+extern void do_cmd_edit_autopick(void);

diff --git a/src/birth.c b/src/birth.c
index a56742c..bef4cdb 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -36,6 +36,7 @@
 #include "world.h"
 #include "objectkind.h"
 #include "monsterrace.h"
+#include "autopick.h"
 
 /*!
  * オートローラーの内容を描画する間隔 / 

diff --git a/src/bldg.c b/src/bldg.c
index 84983ef..ae498f2 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -18,6 +18,7 @@
 #include "floor.h"
 #include "floor-events.h"
 #include "floor-save.h"
+#include "autopick.h"
 #include "objectkind.h"
 #include "object-boost.h"
 #include "object-flavor.h"
@@ -49,6 +50,7 @@
 #include "shoot.h"
 #include "view-mainwindow.h"
 #include "monsterrace.h"
+#include "autopick.h"
 
 
 /*

diff --git a/src/cmd-item.c b/src/cmd-item.c
index cd61a5a..bbe6557 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "autopick.h"
 
 #include "selfinfo.h"
 #include "cmd-activate.h"
@@ -37,6 +38,7 @@
 #include "view-mainwindow.h"
 #include "spells.h"
 #include "objectkind.h"
+#include "autopick.h"
 
 
 /*!

diff --git a/src/cmd-smith.c b/src/cmd-smith.c
index d7b10b2..4d6c532 100644 (file)
--- a/src/cmd-smith.c
+++ b/src/cmd-smith.c
@@ -6,6 +6,7 @@
 #include "player-status.h"
 #include "cmd-basic.h"
 #include "objectkind.h"
+#include "autopick.h"
 
 
 

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index f425480..e614373 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -35,6 +35,7 @@
 #include "cmd-basic.h"
 #include "view-mainwindow.h"
 #include "floor.h"
+#include "autopick.h"
 
 /*!
  * @brief

diff --git a/src/cmd4.c b/src/cmd4.c
index d2af9a0..0668336 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -41,6 +41,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "autopick.h"
 
 #include "birth.h"
 #include "cmd-pet.h"

diff --git a/src/core.c b/src/core.c
index 1d697a6..614bc1a 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -69,6 +69,7 @@
 #include "files.h"
 #include "player-effects.h"
 #include "scores.h"
+#include "autopick.h"
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/

diff --git a/src/externs.h b/src/externs.h
index 0c0b1be..a20dabc 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -32,12 +32,6 @@ extern concptr macro_trigger_keycode[2][MAX_MACRO_TRIG];
 
 extern int level_up;
 
-/* 
- *  List for auto-picker/destroyer entries
- */
-extern int max_autopick;
-extern int max_max_autopick;
-extern autopick_type *autopick_list;
 
 /* tables.c */
 extern const POSITION ddd[9];
@@ -305,17 +299,6 @@ extern FEAT_IDX feat_ground_type[100], feat_wall_type[100];
 extern COMMAND_CODE now_message;
 extern bool use_menu;
 
-/* autopick.c */
-extern void autopick_load_pref(bool disp_mes);
-extern errr process_autopick_file_command(char *buf);
-extern concptr autopick_line_from_entry(autopick_type *entry);
-extern int is_autopick(object_type *o_ptr);
-extern void autopick_alter_item(INVENTORY_IDX item, bool destroy);
-extern void autopick_delayed_alter(void);
-extern void autopick_pickup_items(grid_type *g_ptr);
-extern bool autopick_autoregister(object_type *o_ptr);
-extern void do_cmd_edit_autopick(void);
-
 
 /* grids.c */
 extern void update_local_illumination(POSITION y, POSITION x);

diff --git a/src/files.c b/src/files.c
index a0849fe..cc49954 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -52,6 +52,7 @@
 #include "dungeon.h"
 #include "melee.h"
 #include "objectkind.h"
+#include "autopick.h"
 
 
 /*

diff --git a/src/player-effects.c b/src/player-effects.c
index adb263e..6b33a38 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -39,6 +39,7 @@
 #include "monster-spell.h"
 #include "world.h"
 #include "objectkind.h"
+#include "autopick.h"
 
 /*!
  * @brief プレイヤーの継続行動を設定する。

diff --git a/src/player-move.c b/src/player-move.c
index 1284665..2828e2e 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -142,6 +142,7 @@
 #include "angband.h"
 #include "util.h"
 
+#include "autopick.h"
 #include "dungeon.h"
 #include "floor.h"
 #include "melee.h"
@@ -165,6 +166,7 @@
 #include "view-mainwindow.h"
 #include "world.h"
 #include "objectkind.h"
+#include "autopick.h"
 
 
 #ifdef TRAVEL

diff --git a/src/player-status.c b/src/player-status.c
index 1651955..56fc2fe 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -26,6 +26,7 @@
 #include "player-class.h"
 #include "objectkind.h"
 #include "monsterrace.h"
+#include "autopick.h"
 
 /*!
  * @var horror_desc

diff --git a/src/spells-object.c b/src/spells-object.c
index f2f09da..fceea7b 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -15,6 +15,7 @@
 #include "player-effects.h"
 #include "player-class.h"
 #include "objectkind.h"
+#include "autopick.h"
 
 
 typedef struct

diff --git a/src/spells1.c b/src/spells1.c
index db3bb11..e4f2d6a 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -17,6 +17,7 @@
 #include "cmd-pet.h"
 #include "floor.h"
 #include "trap.h"
+#include "autopick.h"
 #include "object-curse.h"
 #include "player-damage.h"
 #include "player-effects.h"

diff --git a/src/spells2.c b/src/spells2.c
index 6835210..395f86e 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -31,6 +31,7 @@
 #include "spells-status.h"
 #include "spells-floor.h"
 #include "realm-hex.h"
+#include "autopick.h"
 #include "object-flavor.h"
 #include "object-hook.h"
 #include "monster-status.h"

diff --git a/src/spells3.c b/src/spells3.c
index ee7b648..ad86f00 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -45,6 +45,7 @@
 #include "wild.h"
 #include "world.h"
 #include "objectkind.h"
+#include "autopick.h"
 
 
 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */

diff --git a/src/store.c b/src/store.c
index 3e18386..57bb559 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -33,6 +33,7 @@
 #include "mind.h"
 #include "world.h"
 #include "objectkind.h"
+#include "autopick.h"
 
 #define MIN_STOCK 12
 

diff --git a/src/types.h b/src/types.h
index 59ae8ee..cab26ba 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -392,20 +392,6 @@ typedef struct
 }
 feat_prob;
 
-
-/*!
- * @struct autopick_type
- * @brief 自動拾い/破壊設定データの構造体 / A structure type for entry of auto-picker/destroyer
- */
-typedef struct {
-       concptr name;          /*!< 自動拾い/破壊定義の名称一致基準 / Items which have 'name' as part of its name match */
-       concptr insc;          /*!< 対象となったアイテムに自動で刻む内容 / Items will be auto-inscribed as 'insc' */
-       BIT_FLAGS flag[2];       /*!< キーワードに関する汎用的な条件フラグ / Misc. keyword to be matched */
-       byte action;        /*!< 対象のアイテムを拾う/破壊/放置するかの指定フラグ / Auto-pickup or Destroy or Leave items */
-       byte dice;          /*!< 武器のダイス値基準値 / Weapons which have more than 'dice' dice match */
-       byte bonus;         /*!< アイテムのボーナス基準値 / Items which have more than 'bonus' magical bonus match */
-} autopick_type;
-
 typedef struct {
        int flag;
        int type;

diff --git a/src/variable.c b/src/variable.c
index f3c8e17..06d1ad0 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -36,13 +36,6 @@ concptr macro_trigger_keycode[2][MAX_MACRO_TRIG];  /*!< マクロの内容 */
 int level_up = 0; /*!< レベルアップの際に遅延してcalc_mana()関数上で上昇量を表示するかどうかの判定フラグ */
 
 
-/* 
- * 自動拾い/破壊設定のリストに関する変数 / List for auto-picker/destroyer entries
- */
-int max_autopick = 0; /*!< 現在登録している自動拾い/破壊設定の数 */
-int max_max_autopick = 0; /*!< 自動拾い/破壊設定の限界数 */
-autopick_type *autopick_list = NULL; /*!< 自動拾い/破壊設定構造体のポインタ配列 */
-
 /*
  * Savefile version
  */

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index cab40e6..8891074 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "autopick.h"
 
 #include "files.h"
 #include "world.h"