[Refactor] #37353 feat_prob 構造体と関連変数を feature.c/h へ移動．

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 7d1f344..620e891 100644 (file)
--- 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 0dbe5ca..c7dab98 100644 (file)
--- 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 db659b9..88c94aa 100644 (file)
--- 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 90a9d84..33e9955 100644 (file)
--- 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 78cc081..4086e05 100644 (file)
--- 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 2234209..569065b 100644 (file)
--- 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;
-