[Refactor] #40399 Moved some definitions from object1.h to sv-other-types.h

diff --git a/src/cmd/cmd-magiceat.c b/src/cmd/cmd-magiceat.c
index 3557e54..eac4f44 100644 (file)
--- a/src/cmd/cmd-magiceat.c
+++ b/src/cmd/cmd-magiceat.c
@@ -67,6 +67,7 @@
 #include "spell/spells3.h"
 #include "player/player-class.h"
 #include "object/object-kind.h"
+#include "object/sv-other-types.h"
 #include "io/targeting.h"
 
 /*!

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index b967615..2e2ff4d 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -11,6 +11,7 @@
 #include "object/object-kind.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"
+#include "object/sv-other-types.h"
 #include "spell/spells-type.h"
 #include "spell/spells-status.h"
 #include "spell/spells-floor.h"

diff --git a/src/object/chest.c b/src/object/chest.c
index 15145c0..7035be2 100644 (file)
--- a/src/object/chest.c
+++ b/src/object/chest.c
@@ -15,6 +15,10 @@
 #include "spell/spells2.h"
 #include "spell/spells3.h"
 #include "object/item-apply-magic.h"
+#include "object/sv-other-types.h"
+
+/*!< この値以降の小項目IDを持った箱は大型の箱としてドロップ数を増やす / Special "sval" limit -- first "large" chest */
+#define SV_CHEST_MIN_LARGE 4
 
 /*!
 * @brief 箱からアイテムを引き出す /

diff --git a/src/object/object1.h b/src/object/object1.h
index ad76e29..0d26a5e 100644 (file)
--- a/src/object/object1.h
+++ b/src/object/object1.h
@@ -670,9 +670,3 @@ extern s32b flag_cost(object_type *o_ptr, int plusses);
 #define SV_FOOD_WAYBREAD                37
 #define SV_FOOD_PINT_OF_ALE             38
 #define SV_FOOD_PINT_OF_WINE            39
-
-
-#define SV_ROD_MIN_DIRECTION    12 /*!< この値以降の小項目IDを持ったロッドは使用時にターゲットを要求する / Special "sval" limit -- first "aimed" rod */
-
-#define SV_CHEST_MIN_LARGE      4  /*!< この値以降の小項目IDを持った箱は大型の箱としてドロップ数を増やす / Special "sval" limit -- first "large" chest */
-#define SV_CHEST_KANDUME        50 /*!< 箱アイテムの小項目ID: おもちゃのカンヅメ */

diff --git a/src/object/sv-other-types.h b/src/object/sv-other-types.h
index 481ef15..3760c91 100644 (file)
--- a/src/object/sv-other-types.h
+++ b/src/object/sv-other-types.h
@@ -17,3 +17,6 @@
 /* The "sval" codes for TV_SHOT/TV_ARROW/TV_BOLT */
 #define SV_AMMO_LIGHT 0 /* pebbles */
 #define SV_AMMO_NORMAL 1 /* shots, arrows, bolts */
+
+#define SV_ROD_MIN_DIRECTION 12 /*!< この値以降の小項目IDを持ったロッドは使用時にターゲットを要求する / Special "sval" limit -- first "aimed" rod */
+#define SV_CHEST_KANDUME 50 /*!< 箱アイテムの小項目ID: おもちゃのカンヅメ */