[Refactor] #39964 Moved the definition of autopick_type to autopick-util.h

diff --git a/src/autopick/autopick-util.h b/src/autopick/autopick-util.h
index b636da3..bcdebc0 100644 (file)
--- a/src/autopick/autopick-util.h
+++ b/src/autopick/autopick-util.h
@@ -22,6 +22,19 @@
 
 #define DESCRIPT_HGT 3
 
+/*!
+ * @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;
+
 /*
  * Struct for yank buffer
  */
@@ -67,4 +80,3 @@ typedef struct {
        int key;
        int com_id;
 } command_menu_type;
-

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 5a30aa7..0c3fddb 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -20,7 +20,6 @@
 #include "autopick/autopick-key-flag-process.h"
 #include "autopick/autopick-menu-data-table.h"
 #include "autopick/autopick-keys-table.h"
-#include "autopick/autopick-util.h"
 #include "gameterm.h"
 #include "autopick/autopick.h"
 #include "core.h"

diff --git a/src/autopick/autopick.h b/src/autopick/autopick.h
index 90adbfc..d026ecb 100644 (file)
--- a/src/autopick/autopick.h
+++ b/src/autopick/autopick.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "autopick/autopick-util.h"
+
 #define DO_AUTOPICK       0x01
 #define DO_AUTODESTROY    0x02
 #define DO_DISPLAY        0x04
@@ -7,19 +9,6 @@
 #define ITEM_DISPLAY      0x10
 #define DO_QUERY_AUTOPICK 0x20
 
-/*!
- * @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
  */