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

[hengband/hengband.git] / src / birth.c

diff --git a/src/birth.c b/src/birth.c
index 63d9eda..3897699 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -22,6 +22,7 @@
 #include "store.h"
 #include "patron.h"
 #include "quest.h"
+#include "player-class.h"
 #include "player-status.h"
 #include "spells.h"
 #include "spells-status.h"
@@ -29,10 +30,20 @@
 #include "floor.h"
 #include "cmd-pet.h"
 #include "dungeon-file.h"
+#include "floor-town.h"
 #include "files.h"
 #include "birth.h"
 #include "player-skill.h"
 #include "world.h"
+#include "objectkind.h"
+#include "monsterrace.h"
+#include "autopick.h"
+
+ /*
+  * The last character rolled,
+  * holded for quick start
+  */
+birther previous_char;
 
 /*!
  * オートローラーの内容を描画する間隔 / 
@@ -1683,8 +1694,8 @@ static void player_wipe_without_name(void)
        p_ptr->total_weight = 0;
 
        /* No items */
-       inven_cnt = 0;
-       equip_cnt = 0;
+       p_ptr->inven_cnt = 0;
+       p_ptr->equip_cnt = 0;
 
        /* Clear the p_ptr->inventory_list */
        for (i = 0; i < INVEN_TOTAL; i++)
@@ -1973,7 +1984,7 @@ static void wield_all(void)
                p_ptr->total_weight += i_ptr->weight; 
  
                /* Increment the equip counter by hand */ 
-               equip_cnt++;
+               p_ptr->equip_cnt++;
 
        } 
        return; 
@@ -4626,8 +4637,8 @@ void player_birth(void)
        seed_wilderness();
 
        /* Give beastman a mutation at character birth */
-       if (p_ptr->prace == RACE_BEASTMAN) hack_mutation = TRUE;
-       else hack_mutation = FALSE;
+       if (p_ptr->prace == RACE_BEASTMAN) p_ptr->hack_mutation = TRUE;
+       else p_ptr->hack_mutation = FALSE;
 
        /* Set the message window flag as default */
        if (!window_flag[1])