[Refactor] #39321 do_cmd_write_nikki() を exe_write_diary() に改名．

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

diff --git a/src/bldg.c b/src/bldg.c
index e9a89a2..cf3c46a 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -349,7 +349,7 @@ static void arena_comm(int cmd)
                                                msg_print(NULL);
                                        
                                                p_ptr->exit_bldg = FALSE;
-                                               reset_tim_flags();
+                                               reset_tim_flags(p_ptr);
 
                                                /* Save the surface floor as saved floor */
                                                prepare_change_floor_mode(CFM_SAVE_FLOORS);
@@ -379,7 +379,7 @@ static void arena_comm(int cmd)
                        else
                        {
                                p_ptr->exit_bldg = FALSE;
-                               reset_tim_flags();
+                               reset_tim_flags(p_ptr);
 
                                /* Save the surface floor as saved floor */
                                prepare_change_floor_mode(CFM_SAVE_FLOORS);
@@ -1428,12 +1428,12 @@ static bool gamble_comm(int cmd)
                        {
                                msg_print(_("「今回は儲けたな！でも次はこっちが勝ってやるからな、絶対に！」",
                                                        "You came out a winner! We'll win next time, I'm sure."));
-                               chg_virtue(V_CHANCE, 3);
+                               chg_virtue(p_ptr, V_CHANCE, 3);
                        }
                        else
                        {
                                msg_print(_("「金をスッてしまったな、わはは！うちに帰った方がいいぜ。」", "You lost gold! Haha, better head home."));
-                               chg_virtue(V_CHANCE, -3);
+                               chg_virtue(p_ptr, V_CHANCE, -3);
                        }
                }
                msg_print(NULL);
@@ -1657,7 +1657,7 @@ static bool kakutoujou(void)
                        battle_odds = MAX(wager+1, wager * battle_odds / 100);
                        kakekin = wager;
                        p_ptr->au -= wager;
-                       reset_tim_flags();
+                       reset_tim_flags(p_ptr);
 
                        /* Save the surface floor as saved floor */
                        prepare_change_floor_mode(CFM_SAVE_FLOORS);
@@ -1937,7 +1937,7 @@ static bool kankin(void)
                                inven_item_increase(i, -o_ptr->number);
                                inven_item_describe(i);
                                inven_item_optimize(i);
-                               chg_virtue(V_JUSTICE, 5);
+                               chg_virtue(p_ptr, V_JUSTICE, 5);
                                current_world_ptr->bounty_r_idx[j] += 10000;
 
                                change = TRUE;
@@ -1948,7 +1948,7 @@ static bool kankin(void)
                                inven_item_describe(i);
                                inven_item_optimize(i);
 
-                               chg_virtue(V_JUSTICE, 5);
+                               chg_virtue(p_ptr, V_JUSTICE, 5);
                                current_world_ptr->bounty_r_idx[j] += 10000;
 
                                /* Count number of unique corpses already handed */
@@ -2016,7 +2016,7 @@ static bool inn_comm(int cmd)
                                return FALSE;
                        }
                        msg_print(_("バーテンはいくらかの食べ物とビールをくれた。", "The barkeep gives you some gruel and a beer."));
-                       (void)set_food(PY_FOOD_MAX - 1);
+                       (void)set_food(p_ptr, PY_FOOD_MAX - 1);
                        break;
 
                case BACT_REST: /* Rest for the night */
@@ -2033,9 +2033,9 @@ static bool inn_comm(int cmd)
 
                                extract_day_hour_min(&prev_day, &prev_hour, &prev_min);
                                if ((prev_hour >= 6) && (prev_hour <= 17)) 
-                                       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("宿屋に泊まった。", "stay over daytime at the inn."));
+                                       exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("宿屋に泊まった。", "stay over daytime at the inn."));
                                else
-                                       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("宿屋に泊まった。", "stay over night at the inn."));
+                                       exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("宿屋に泊まった。", "stay over night at the inn."));
                                
                                current_world_ptr->game_turn = (current_world_ptr->game_turn / (TURNS_PER_TICK * TOWN_DAWN / 2) + 1) * (TURNS_PER_TICK * TOWN_DAWN / 2);
                                if (current_world_ptr->dungeon_turn < current_world_ptr->dungeon_turn_limit)
@@ -2046,7 +2046,7 @@ static bool inn_comm(int cmd)
 
                                prevent_turn_overflow();
 
-                               if ((prev_hour >= 18) && (prev_hour <= 23)) do_cmd_write_nikki(NIKKI_HIGAWARI, 0, NULL);
+                               if ((prev_hour >= 18) && (prev_hour <= 23)) exe_write_diary(p_ptr, NIKKI_HIGAWARI, 0, NULL);
                                p_ptr->chp = p_ptr->mhp;
 
                                if (ironman_nightmare)
@@ -2056,17 +2056,17 @@ static bool inn_comm(int cmd)
                                        /* Have some nightmares */
                                        while(1)
                                        {
-                                               sanity_blast(NULL, FALSE);
+                                               sanity_blast(p_ptr, NULL, FALSE);
                                                if (!one_in_(3)) break;
                                        }
 
                                        msg_print(_("あなたは絶叫して目を覚ました。", "You awake screaming."));
-                                       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("悪夢にうなされてよく眠れなかった。", "be troubled by a nightmare."));
+                                       exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("悪夢にうなされてよく眠れなかった。", "be troubled by a nightmare."));
                                }
                                else
                                {
                                        set_blind(p_ptr, 0);
-                                       set_confused(0);
+                                       set_confused(p_ptr, 0);
                                        p_ptr->stun = 0;
                                        p_ptr->chp = p_ptr->mhp;
                                        p_ptr->csp = p_ptr->msp;
@@ -2086,12 +2086,12 @@ static bool inn_comm(int cmd)
                                        if ((prev_hour >= 6) && (prev_hour <= 17))
                                        {
                                                msg_print(_("あなたはリフレッシュして目覚め、夕方を迎えた。", "You awake refreshed for the evening."));
-                                               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("夕方を迎えた。", "awake refreshed."));
+                                               exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("夕方を迎えた。", "awake refreshed."));
                                        }
                                        else
                                        {
                                                msg_print(_("あなたはリフレッシュして目覚め、新たな日を迎えた。", "You awake refreshed for the new day."));
-                                               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("すがすがしい朝を迎えた。", "awake refreshed."));
+                                               exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("すがすがしい朝を迎えた。", "awake refreshed."));
                                        }
                                }
                        }
@@ -3131,7 +3131,7 @@ static PRICE repair_broken_weapon_aux(PRICE bcost)
        o_ptr->discount = 99;
 
        p_ptr->total_weight += o_ptr->weight;
-       calc_android_exp();
+       calc_android_exp(p_ptr);
 
        /* Decrease material object */
        inven_item_increase(mater, -1);
@@ -3254,7 +3254,7 @@ static bool enchant_item(PRICE cost, HIT_PROB to_hit, HIT_POINT to_dam, ARMOUR_C
                /* Charge the money */
                p_ptr->au -= (cost * o_ptr->number);
 
-               if (item >= INVEN_RARM) calc_android_exp();
+               if (item >= INVEN_RARM) calc_android_exp(p_ptr);
 
                /* Something happened */
                return (TRUE);
@@ -3818,7 +3818,6 @@ static bool research_mon(void)
                        /* Normal commands */
                        if (query != 'r') break;
 
-                       /* Toggle recall */
                        recall = !recall;
                }
 
@@ -3996,7 +3995,7 @@ static void bldg_process_command(building_type *bldg, int i)
                if (p_ptr->muta1 || p_ptr->muta2 || (p_ptr->muta3 & ~MUT3_GOOD_LUCK) ||
                        (p_ptr->pseikaku != SEIKAKU_LUCKY && (p_ptr->muta3 & MUT3_GOOD_LUCK)))
                {
-                       while(!lose_mutation(0));
+                       while(!lose_mutation(p_ptr, 0));
                        paid = TRUE;
                }
                else
@@ -4028,25 +4027,25 @@ static void bldg_process_command(building_type *bldg, int i)
 
        case BACT_HEIKOUKA:
                msg_print(_("平衡化の儀式を行なった。", "You received an equalization ritual."));
-               set_virtue(V_COMPASSION, 0);
-               set_virtue(V_HONOUR, 0);
-               set_virtue(V_JUSTICE, 0);
-               set_virtue(V_SACRIFICE, 0);
-               set_virtue(V_KNOWLEDGE, 0);
-               set_virtue(V_FAITH, 0);
-               set_virtue(V_ENLIGHTEN, 0);
-               set_virtue(V_ENCHANT, 0);
-               set_virtue(V_CHANCE, 0);
-               set_virtue(V_NATURE, 0);
-               set_virtue(V_HARMONY, 0);
-               set_virtue(V_VITALITY, 0);
-               set_virtue(V_UNLIFE, 0);
-               set_virtue(V_PATIENCE, 0);
-               set_virtue(V_TEMPERANCE, 0);
-               set_virtue(V_DILIGENCE, 0);
-               set_virtue(V_VALOUR, 0);
-               set_virtue(V_INDIVIDUALISM, 0);
-               get_virtues();
+               set_virtue(p_ptr, V_COMPASSION, 0);
+               set_virtue(p_ptr, V_HONOUR, 0);
+               set_virtue(p_ptr, V_JUSTICE, 0);
+               set_virtue(p_ptr, V_SACRIFICE, 0);
+               set_virtue(p_ptr, V_KNOWLEDGE, 0);
+               set_virtue(p_ptr, V_FAITH, 0);
+               set_virtue(p_ptr, V_ENLIGHTEN, 0);
+               set_virtue(p_ptr, V_ENCHANT, 0);
+               set_virtue(p_ptr, V_CHANCE, 0);
+               set_virtue(p_ptr, V_NATURE, 0);
+               set_virtue(p_ptr, V_HARMONY, 0);
+               set_virtue(p_ptr, V_VITALITY, 0);
+               set_virtue(p_ptr, V_UNLIFE, 0);
+               set_virtue(p_ptr, V_PATIENCE, 0);
+               set_virtue(p_ptr, V_TEMPERANCE, 0);
+               set_virtue(p_ptr, V_DILIGENCE, 0);
+               set_virtue(p_ptr, V_VALOUR, 0);
+               set_virtue(p_ptr, V_INDIVIDUALISM, 0);
+               get_virtues(p_ptr);
                paid = TRUE;
                break;