[Refactor] #37353 birther 構造体と関連変数を birth.h へ移動．

diff --git a/src/Makefile.am b/src/Makefile.am
index bbb1470..c0ac55d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ hengband_SOURCES = \
        \
        dungeon.c dungeon.h \
        floor.c floor.h floor-events.c floor-events.h floor-generate.c floor-generate.h \
-       floor-save.h floor-save.c \
+       floor-save.h floor-save.c floor-town.h floor-town.c \
        floor-streams.c floor-streams.h \
        \
        feature.c feature.h \

diff --git a/src/birth.c b/src/birth.c
index ad2c1c0..3897699 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -39,6 +39,12 @@
 #include "monsterrace.h"
 #include "autopick.h"
 
+ /*
+  * The last character rolled,
+  * holded for quick start
+  */
+birther previous_char;
+
 /*!
  * オートローラーの内容を描画する間隔 / 
  * How often the autoroller will update the display and pause

diff --git a/src/birth.h b/src/birth.h
index 8bd9862..0faf9ac 100644 (file)
--- a/src/birth.h
+++ b/src/birth.h
@@ -1,5 +1,41 @@
 #pragma once
 
+/*
+ * A structure to hold "rolled" information
+ */
+typedef struct birther birther;
+
+struct birther
+{
+       SEX_IDX psex;           /* Sex index */
+       RACE_IDX prace;         /* Race index */
+       CLASS_IDX pclass;       /* Class index */
+       CHARACTER_IDX pseikaku; /* Seikaku index */
+       REALM_IDX realm1;       /* First magic realm */
+       REALM_IDX realm2;       /* Second magic realm */
+
+       s16b age;
+       s16b ht;
+       s16b wt;
+       s16b sc;
+
+       PRICE au; /*!< 初期の所持金 */
+
+       BASE_STATUS stat_max[6];        /* Current "maximal" stat values */
+       BASE_STATUS stat_max_max[6];    /* Maximal "maximal" stat values */
+       HIT_POINT player_hp[PY_MAX_LEVEL];
+
+       PATRON_IDX chaos_patron;
+
+       s16b vir_types[8];
+
+       char history[4][60];
+
+       bool quick_ok;
+};
+
+extern birther previous_char;
+
 /* birth.c */
 extern void add_history_from_pref_line(concptr t);
 extern void player_birth(void);
@@ -7,3 +43,4 @@ extern void get_max_stats(void);
 extern void get_height_weight(void);
 extern void player_outfit(void);
 extern void dump_yourself(FILE *fff);
+

diff --git a/src/externs.h b/src/externs.h
index 214a85c..d746684 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -224,7 +224,6 @@ extern player_type *p_ptr;
 extern const player_sex *sp_ptr;
 extern const player_race *rp_ptr;
 extern const player_seikaku *ap_ptr;
-extern birther previous_char;
 extern char *f_name;
 extern char *f_tag;
 

diff --git a/src/load.c b/src/load.c
index 0c16f32..6437a05 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -69,6 +69,7 @@
 #include "files.h"
 #include "player-skill.h"
 #include "player-class.h"
+#include "birth.h"
 #include "world.h"
 #include "objectkind.h"
 #include "object-ego.h"

diff --git a/src/save.c b/src/save.c
index 2c703d9..8b084e8 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -27,6 +27,7 @@
 #include "world.h"
 #include "objectkind.h"
 #include "monsterrace.h"
+#include "birth.h"
 
 
 /*

diff --git a/src/types.h b/src/types.h
index 5dccb16..e00a631 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -224,42 +224,6 @@ struct player_seikaku
 };
 
 
-
-/*
- * A structure to hold "rolled" information
- */
-typedef struct birther birther;
-
-struct birther
-{
-       SEX_IDX psex;           /* Sex index */
-       RACE_IDX prace;         /* Race index */
-       CLASS_IDX pclass;       /* Class index */
-       CHARACTER_IDX pseikaku; /* Seikaku index */
-       REALM_IDX realm1;       /* First magic realm */
-       REALM_IDX realm2;       /* Second magic realm */
-
-       s16b age;
-       s16b ht;
-       s16b wt;
-       s16b sc;
-
-       PRICE au; /*!< 初期の所持金 */
-
-       BASE_STATUS stat_max[6];        /* Current "maximal" stat values */
-       BASE_STATUS stat_max_max[6];    /* Maximal "maximal" stat values */
-       HIT_POINT player_hp[PY_MAX_LEVEL];
-
-       PATRON_IDX chaos_patron;
-
-       s16b vir_types[8];
-
-       char history[4][60];
-
-       bool quick_ok;
-};
-
-
 /* For Monk martial arts */
 
 typedef struct martial_arts martial_arts;

diff --git a/src/variable.c b/src/variable.c
index d271f22..66531ec 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -478,12 +478,6 @@ const player_race *rp_ptr;
 const player_seikaku *ap_ptr;
 
 
-/*
- * The last character rolled,
- * holded for quick start
- */
-birther previous_char;
-
 concptr ANGBAND_SYS = "xxx"; //!< Hack -- The special Angband "System Suffix" This variable is used to choose an appropriate "pref-xxx" file