From be5a3ca5ea259911cc3dd4e550cecccdc9f5e243 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Thu, 2 May 2019 23:17:46 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20feat=5Fprob=E3=80=80?=
 =?utf8?q?=E6=A7=8B=E9=80=A0=E4=BD=93=E3=81=A8=E9=96=A2=E9=80=A3=E5=A4=89?=
 =?utf8?q?=E6=95=B0=E3=82=92=E3=80=80feature.c/h=20=E3=81=B8=E7=A7=BB?=
 =?utf8?q?=E5=8B=95=EF=BC=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd-basic.c | 1 +
 src/cmd4.c      | 1 +
 src/core.c      | 1 +
 src/dungeon.h   | 1 +
 src/feature.h   | 6 ++++++
 src/types.h     | 9 ---------
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 7d1f34404..620e891ce 100644
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -16,6 +16,7 @@
 #include "chest.h"
 #include "trap.h"
 #include "dungeon.h"
+#include "feature.h"
 #include "floor.h"
 #include "melee.h"
 #include "object-hook.h"
diff --git a/src/cmd4.c b/src/cmd4.c
index 0dbe5ca38..c7dab9879 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -47,6 +47,7 @@
 #include "cmd-pet.h"
 #include "cmd-spell.h"
 #include "dungeon.h"
+#include "feature.h"
 #include "world.h"
 #include "player-effects.h"
 #include "player-status.h"
diff --git a/src/core.c b/src/core.c
index db659b955..88c94aade 100644
--- a/src/core.c
+++ b/src/core.c
@@ -31,6 +31,7 @@
 #include "cmd-basic.h"
 #include "snipe.h"
 #include "dungeon.h"
+#include "feature.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "floor-town.h"
diff --git a/src/dungeon.h b/src/dungeon.h
index 90a9d84e6..33e9955f8 100644
--- a/src/dungeon.h
+++ b/src/dungeon.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "feature.h"
 
 /* A structure for the != dungeon types */
 typedef struct dungeon_type dungeon_type;
diff --git a/src/feature.h b/src/feature.h
index 78cc08114..4086e0561 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -13,6 +13,12 @@ struct feature_state
 	FEAT_IDX result; /*!< 変化先ID / Result (f_info ID) */
 };
 
+typedef struct
+{
+	FEAT_IDX feat;    /* Feature tile */
+	PERCENTAGE percent; /* Chance of type */
+}
+feat_prob;
 
 /*!
  * @struct feature_type
diff --git a/src/types.h b/src/types.h
index 22342099c..569065b77 100644
--- a/src/types.h
+++ b/src/types.h
@@ -72,12 +72,3 @@ typedef bool (*monsterrace_hook_type)(MONRACE_IDX r_idx);
  * This seems like a pretty standard "typedef"
  */
 typedef int (*inven_func)(object_type *);
-
-
-typedef struct
-{
-	FEAT_IDX feat;    /* Feature tile */
-	PERCENTAGE percent; /* Chance of type */
-}
-feat_prob;
-
-- 
2.11.0