From f4a3e552c5b6ed79268655bc00b2a6308b2fd313 Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 15 May 2019 23:53:40 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20coin=5Ftype=20=E3=82=92=20?= =?utf8?q?object2.c/object.h=20=E3=81=B8=E7=A7=BB=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 1 - src/object.h | 2 ++ src/object2.c | 2 ++ src/variable.c | 2 -- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/externs.h b/src/externs.h index da80df3a3..c6355e7ef 100644 --- 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 86f5fb3ec..70fdab181 100644 --- 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 /*!< ” ‚©‚炳‚ç‚É” ‚ªoŒ»‚·‚邱‚Æ‚ð—}Ž~‚·‚é */ 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 b24b28fb0..4f3d87bf7 100644 --- 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 f22de53ee..59db8cc40 100644 --- 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 */ -- 2.11.0