[Refactor] #37353 coin_type を object2.c/object.h へ移動．

diff --git a/src/externs.h b/src/externs.h
index da80df3..c6355e7 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -59,7 +59,6 @@ extern s16b running;
 extern s16b signal_count;
 
 extern bool get_com_no_macros;
-extern OBJECT_SUBTYPE_VALUE coin_type;
 
 extern bool repair_monsters;
 extern bool repair_objects;

diff --git a/src/object.h b/src/object.h
index 86f5fb3..70fdab1 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -154,6 +154,8 @@ extern void object_copy(object_type *o_ptr, object_type *j_ptr);
 #define AM_FORBID_CHEST 0x00000020 /*!< \94 \82©\82ç\82³\82ç\82É\94 \82ª\8fo\8c»\82·\82é\82±\82Æ\82ð\97}\8e~\82·\82é */
 extern void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode);
 
+extern OBJECT_SUBTYPE_VALUE coin_type;
+
 extern bool make_object(object_type *j_ptr, BIT_FLAGS mode);
 extern void place_object(POSITION y, POSITION x, BIT_FLAGS mode);
 extern bool make_gold(object_type *j_ptr);

diff --git a/src/object2.c b/src/object2.c
index b24b28f..4f3d87b 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -4447,6 +4447,8 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
 }
 
 
+OBJECT_SUBTYPE_VALUE coin_type;        /* Hack -- force coin type */
+
 /*!
  * @brief 生成階に応じた財宝オブジェクトの生成を行う。
  * Make a treasure object

diff --git a/src/variable.c b/src/variable.c
index f22de53..59db8cc 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -34,8 +34,6 @@ s16b signal_count;            /* Hack -- Count interupts */
 
 bool get_com_no_macros = FALSE;        /* Expand macros in "get_com" or not */
 
-OBJECT_SUBTYPE_VALUE coin_type;        /* Hack -- force coin type */
-
 bool repair_monsters;  /* Hack -- optimize detect monsters */
 bool repair_objects;   /* Hack -- optimize detect objects */