[Refactor] #37353 autopick.h を作成して関連構造体と変数を移動．

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

diff --git a/src/birth.c b/src/birth.c
index 9777edb..bef4cdb 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -12,15 +12,31 @@
  */
 
 #include "angband.h"
+#include "util.h"
+#include "bldg.h"
+
+#include "artifact.h"
 #include "avatar.h"
 #include "history.h"
 #include "monsterrace-hook.h"
 #include "store.h"
+#include "patron.h"
 #include "quest.h"
+#include "player-class.h"
 #include "player-status.h"
 #include "spells.h"
 #include "spells-status.h"
 #include "wild.h"
+#include "floor.h"
+#include "cmd-pet.h"
+#include "dungeon-file.h"
+#include "files.h"
+#include "birth.h"
+#include "player-skill.h"
+#include "world.h"
+#include "objectkind.h"
+#include "monsterrace.h"
+#include "autopick.h"
 
 /*!
  * オートローラーの内容を描画する間隔 / 
@@ -1671,13 +1687,13 @@ 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 inventory */
+       /* Clear the p_ptr->inventory_list */
        for (i = 0; i < INVEN_TOTAL; i++)
        {
-               object_wipe(&inventory[i]);
+               object_wipe(&p_ptr->inventory_list[i]);
        }
 
 
@@ -1738,7 +1754,7 @@ static void player_wipe_without_name(void)
        p_ptr->knowledge = 0;
 
        /* Clean the mutation count */
-       mutant_regenerate_mod = 100;
+       p_ptr->mutant_regenerate_mod = 100;
 
        /* Clear "cheat" options */
        cheat_peek = FALSE;
@@ -1806,7 +1822,7 @@ static void player_wipe_without_name(void)
        p_ptr->today_mon = 0;
 
        /* Reset monster arena */
-       battle_monsters();
+       update_gambling_monsters();
 
        /* Reset mutations */
        p_ptr->muta1 = 0;
@@ -1884,7 +1900,7 @@ static void init_dungeon_quests(void)
 }
 
 /*!
- * @brief ゲームターンを初期化する / Reset turn
+ * @brief ゲームターンを初期化する / Reset current_world_ptr->game_turn
  * @details アンデッド系種族は開始時刻を夜からにする。
  * @return なし
  */
@@ -1896,17 +1912,17 @@ static void init_turn(void)
                (p_ptr->prace == RACE_SPECTRE))
        {
                /* Undead start just after midnight */
-               turn = (TURNS_PER_TICK*3 * TOWN_DAWN) / 4 + 1;
-               turn_limit = TURNS_PER_TICK * TOWN_DAWN * MAX_DAYS + TURNS_PER_TICK * TOWN_DAWN * 3 / 4;
+               current_world_ptr->game_turn = (TURNS_PER_TICK*3 * TOWN_DAWN) / 4 + 1;
+               current_world_ptr->game_turn_limit = TURNS_PER_TICK * TOWN_DAWN * MAX_DAYS + TURNS_PER_TICK * TOWN_DAWN * 3 / 4;
        }
        else
        {
-               turn = 1;
-               turn_limit = TURNS_PER_TICK * TOWN_DAWN * (MAX_DAYS - 1) + TURNS_PER_TICK * TOWN_DAWN * 3 / 4;
+               current_world_ptr->game_turn = 1;
+               current_world_ptr->game_turn_limit = TURNS_PER_TICK * TOWN_DAWN * (MAX_DAYS - 1) + TURNS_PER_TICK * TOWN_DAWN * 3 / 4;
        }
 
-       dungeon_turn = 1;
-       dungeon_turn_limit = TURNS_PER_TICK * TOWN_DAWN * (MAX_DAYS - 1) + TURNS_PER_TICK * TOWN_DAWN * 3 / 4;
+       current_world_ptr->dungeon_turn = 1;
+       current_world_ptr->dungeon_turn_limit = TURNS_PER_TICK * TOWN_DAWN * (MAX_DAYS - 1) + TURNS_PER_TICK * TOWN_DAWN * 3 / 4;
 }
 
 
@@ -1927,7 +1943,7 @@ static void wield_all(void)
        /* Scan through the slots backwards */ 
        for (item = INVEN_PACK - 1; item >= 0; item--) 
        { 
-               o_ptr = &inventory[item]; 
+               o_ptr = &p_ptr->inventory_list[item]; 
  
                /* Skip non-objects */ 
                if (!o_ptr->k_idx) continue; 
@@ -1936,7 +1952,7 @@ static void wield_all(void)
                slot = wield_slot(o_ptr); 
                if (slot < INVEN_RARM) continue; 
                if (slot == INVEN_LITE) continue; /* Does not wield toaches because buys a lantern soon */
-               if (inventory[slot].k_idx) continue; 
+               if (p_ptr->inventory_list[slot].k_idx) continue; 
  
                i_ptr = &object_type_body; 
                object_copy(i_ptr, o_ptr); 
@@ -1956,12 +1972,12 @@ static void wield_all(void)
                        floor_item_optimize(0 - item); 
                } 
  
-               o_ptr = &inventory[slot]; 
+               o_ptr = &p_ptr->inventory_list[slot]; 
                object_copy(o_ptr, i_ptr); 
                p_ptr->total_weight += i_ptr->weight; 
  
                /* Increment the equip counter by hand */ 
-               equip_cnt++;
+               p_ptr->equip_cnt++;
 
        } 
        return; 
@@ -4119,7 +4135,7 @@ static bool player_birth_aux(void)
        /* Clear */
        clear_from(10);
 
-       /* Reset turn; before auto-roll and after choosing race */
+       /* Reset current_world_ptr->game_turn; before auto-roll and after choosing race */
        init_turn();
 
        /*** Generate ***/
@@ -4544,11 +4560,11 @@ void player_birth(void)
        int i, j;
        char buf[80];
 
-       playtime = 0;
+       current_world_ptr->play_time = 0;
 
        /* 
         * Wipe monsters in old dungeon
-        * This wipe destroys value of m_list[].cur_num .
+        * This wipe destroys value of current_floor_ptr->m_list[].cur_num .
         */
        wipe_m_list();
 
@@ -4614,8 +4630,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])