[Refactor] #38997 do_cmd_write_nikki() に player_type * 引数を追加．

diff --git a/src/birth.c b/src/birth.c
index 12cafdf..95c03c0 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -4598,26 +4598,26 @@ void player_birth(player_type *creature_ptr)
        message_add(" ");
        message_add("  ");
 
-       do_cmd_write_nikki(NIKKI_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "-------- Start New Game --------"));
-       do_cmd_write_nikki(NIKKI_HIGAWARI, 0, NULL);
+       do_cmd_write_nikki(p_ptr, NIKKI_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "-------- Start New Game --------"));
+       do_cmd_write_nikki(p_ptr, NIKKI_HIGAWARI, 0, NULL);
 
        sprintf(buf,_("                            性別に%sを選択した。", "                            choose %s personality."), sex_info[creature_ptr->psex].title);
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
+       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 1, buf);
 
        sprintf(buf,_("                            種族に%sを選択した。", "                            choose %s race."), race_info[creature_ptr->prace].title);
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
+       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 1, buf);
 
        sprintf(buf,_("                            職業に%sを選択した。", "                            choose %s class."), class_info[creature_ptr->pclass].title);
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
+       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 1, buf);
 
        if (creature_ptr->realm1)
        {
                sprintf(buf,_("                            魔法の領域に%s%sを選択した。", "                            choose %s%s realm."),realm_names[creature_ptr->realm1], creature_ptr->realm2 ? format("と%s",realm_names[creature_ptr->realm2]) : "");
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 1, buf);
        }
 
        sprintf(buf,_("                            性格に%sを選択した。", "                            choose %s."), seikaku_info[creature_ptr->pseikaku].title);
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 1, buf);
+       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 1, buf);
 
        /* Init the shops */
        for (i = 1; i < max_towns; i++)

diff --git a/src/bldg.c b/src/bldg.c
index f9cb1c5..4dbc16c 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -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."));
+                                       do_cmd_write_nikki(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."));
+                                       do_cmd_write_nikki(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)) do_cmd_write_nikki(p_ptr, NIKKI_HIGAWARI, 0, NULL);
                                p_ptr->chp = p_ptr->mhp;
 
                                if (ironman_nightmare)
@@ -2061,7 +2061,7 @@ static bool inn_comm(int cmd)
                                        }
 
                                        msg_print(_("あなたは絶叫して目を覚ました。", "You awake screaming."));
-                                       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("悪夢にうなされてよく眠れなかった。", "be troubled by a nightmare."));
+                                       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("悪夢にうなされてよく眠れなかった。", "be troubled by a nightmare."));
                                }
                                else
                                {
@@ -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."));
+                                               do_cmd_write_nikki(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."));
+                                               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("すがすがしい朝を迎えた。", "awake refreshed."));
                                        }
                                }
                        }

diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 484c176..7aab099 100644 (file)
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -305,7 +305,7 @@ void do_cmd_go_up(player_type *creature_ptr)
                if (current_floor_ptr->dun_level - up_num < d_info[creature_ptr->dungeon_idx].mindepth)
                        up_num = current_floor_ptr->dun_level;
        }
-       if (record_stair) do_cmd_write_nikki(NIKKI_STAIR, 0-up_num, _("階段を上った", "climbed up the stairs to"));
+       if (record_stair) do_cmd_write_nikki(creature_ptr, NIKKI_STAIR, 0-up_num, _("階段を上った", "climbed up the stairs to"));
 
        /* Success */
        if ((creature_ptr->pseikaku == SEIKAKU_COMBAT) || (creature_ptr->inventory_list[INVEN_BOW].name1 == ART_CRIMSON))
@@ -439,8 +439,8 @@ void do_cmd_go_down(player_type *creature_ptr)
 
                if (record_stair)
                {
-                       if (fall_trap) do_cmd_write_nikki(NIKKI_STAIR, down_num, _("落とし戸に落ちた", "fell through a trap door"));
-                       else do_cmd_write_nikki(NIKKI_STAIR, down_num, _("階段を下りた", "climbed down the stairs to"));
+                       if (fall_trap) do_cmd_write_nikki(creature_ptr, NIKKI_STAIR, down_num, _("落とし戸に落ちた", "fell through a trap door"));
+                       else do_cmd_write_nikki(creature_ptr, NIKKI_STAIR, down_num, _("階段を下りた", "climbed down the stairs to"));
                }
 
                if (fall_trap)
@@ -2909,9 +2909,9 @@ void do_cmd_suicide(player_type *creature_ptr)
 
        if (!creature_ptr->total_winner)
        {
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("ダンジョンの探索に絶望して自殺した。", "give up all hope to commit suicide."));
-               do_cmd_write_nikki(NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 1, "\n\n\n\n");
+               do_cmd_write_nikki(creature_ptr, NIKKI_BUNSHOU, 0, _("ダンジョンの探索に絶望して自殺した。", "give up all hope to commit suicide."));
+               do_cmd_write_nikki(creature_ptr, NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
+               do_cmd_write_nikki(creature_ptr, NIKKI_BUNSHOU, 1, "\n\n\n\n");
        }
 
        /* Cause of death */

diff --git a/src/cmd-dump.c b/src/cmd-dump.c
index 1798448..03756c3 100644 (file)
--- a/src/cmd-dump.c
+++ b/src/cmd-dump.c
@@ -399,7 +399,7 @@ concptr get_ordinal_number_suffix(int num)
  * @param note 日記内容のIDに応じた文字列参照ポインタ
  * @return エラーID
  */
-errr do_cmd_write_nikki(int type, int num, concptr note)
+errr do_cmd_write_nikki(player_type *creature_ptr, int type, int num, concptr note)
 {
        int day, hour, min;
        FILE *fff = NULL;
@@ -424,8 +424,8 @@ errr do_cmd_write_nikki(int type, int num, concptr note)
        {
                QUEST_IDX old_quest;
 
-               old_quest = p_ptr->inside_quest;
-               p_ptr->inside_quest = (quest[num].type == QUEST_TYPE_RANDOM) ? 0 : num;
+               old_quest = creature_ptr->inside_quest;
+               creature_ptr->inside_quest = (quest[num].type == QUEST_TYPE_RANDOM) ? 0 : num;
 
                /* Get the quest text */
                init_flags = INIT_NAME_ONLY;
@@ -433,7 +433,7 @@ errr do_cmd_write_nikki(int type, int num, concptr note)
                process_dungeon_file("q_info.txt", 0, 0, 0, 0);
 
                /* Reset the old quest number */
-               p_ptr->inside_quest = old_quest;
+               creature_ptr->inside_quest = old_quest;
        }
 
        /* different filne name to avoid mixing */
@@ -458,7 +458,7 @@ errr do_cmd_write_nikki(int type, int num, concptr note)
 
        if (write_level)
        {
-               if (p_ptr->inside_arena)
+               if (creature_ptr->inside_arena)
                        note_level = _("アリーナ:", "Arane:");
                else if (!current_floor_ptr->dun_level)
                        note_level = _("地上:", "Surface:");
@@ -468,9 +468,9 @@ errr do_cmd_write_nikki(int type, int num, concptr note)
                else
                {
 #ifdef JP
-                       sprintf(note_level_buf, "%d階(%s):", (int)current_floor_ptr->dun_level, d_name+d_info[p_ptr->dungeon_idx].name);
+                       sprintf(note_level_buf, "%d階(%s):", (int)current_floor_ptr->dun_level, d_name+d_info[creature_ptr->dungeon_idx].name);
 #else
-                       sprintf(note_level_buf, "%s L%d:", d_name+d_info[p_ptr->dungeon_idx].name, (int)current_floor_ptr->dun_level);
+                       sprintf(note_level_buf, "%s L%d:", d_name+d_info[creature_ptr->dungeon_idx].name, (int)current_floor_ptr->dun_level);
 #endif
                        note_level = note_level_buf;
                }
@@ -545,8 +545,8 @@ errr do_cmd_write_nikki(int type, int num, concptr note)
                {
                        fprintf(fff, _(" %2d:%02d %20s %sの最深階%d階に到達した。\n",
                                                   " %2d:%02d %20s reached level %d of %s for the first time.\n"), hour, min, note_level,
-                                                  _(d_name+d_info[p_ptr->dungeon_idx].name, num),
-                                                  _(num, d_name+d_info[p_ptr->dungeon_idx].name));
+                                                  _(d_name+d_info[creature_ptr->dungeon_idx].name, num),
+                                                  _(num, d_name+d_info[creature_ptr->dungeon_idx].name));
                        break;
                }
                case NIKKI_TRUMP:
@@ -577,8 +577,8 @@ errr do_cmd_write_nikki(int type, int num, concptr note)
                {
                        if (!num)
                        fprintf(fff, _(" %2d:%02d %20s 帰還を使って%sの%d階へ下りた。\n", " %2d:%02d %20s recalled to dungeon level %d of %s.\n"), 
-                                               hour, min, note_level, _(d_name+d_info[p_ptr->dungeon_idx].name, (int)max_dlv[p_ptr->dungeon_idx]), 
-                                                                                          _((int)max_dlv[p_ptr->dungeon_idx], d_name+d_info[p_ptr->dungeon_idx].name));
+                                               hour, min, note_level, _(d_name+d_info[creature_ptr->dungeon_idx].name, (int)max_dlv[creature_ptr->dungeon_idx]), 
+                                                                                          _((int)max_dlv[creature_ptr->dungeon_idx], d_name+d_info[creature_ptr->dungeon_idx].name));
                        else
                                fprintf(fff, _(" %2d:%02d %20s 帰還を使って地上へと戻った。\n", " %2d:%02d %20s recalled from dungeon to surface.\n"), hour, min, note_level);
                        break;
@@ -637,7 +637,7 @@ errr do_cmd_write_nikki(int type, int num, concptr note)
                        if (!current_floor_ptr->dun_level)
                                to = _("地上", "the surface");
                        else
-                               to = format(_("%d階(%s)", "level %d of %s"), current_floor_ptr->dun_level, d_name+d_info[p_ptr->dungeon_idx].name);
+                               to = format(_("%d階(%s)", "level %d of %s"), current_floor_ptr->dun_level, d_name+d_info[creature_ptr->dungeon_idx].name);
 
                        fprintf(fff, _(" %2d:%02d %20s %sへとウィザード・テレポートで移動した。\n",
                                                   " %2d:%02d %20s wizard-teleport to %s.\n"), hour, min, note_level, to);
@@ -649,7 +649,7 @@ errr do_cmd_write_nikki(int type, int num, concptr note)
                        if (!current_floor_ptr->dun_level)
                                to = _("地上", "the surface");
                        else
-                               to = format(_("%d階(%s)", "level %d of %s"), current_floor_ptr->dun_level, d_name+d_info[p_ptr->dungeon_idx].name);
+                               to = format(_("%d階(%s)", "level %d of %s"), current_floor_ptr->dun_level, d_name+d_info[creature_ptr->dungeon_idx].name);
 
                        fprintf(fff, _(" %2d:%02d %20s %sへとパターンの力で移動した。\n",
                                                   " %2d:%02d %20s used Pattern to teleport to %s.\n"), hour, min, note_level, to);
@@ -860,7 +860,7 @@ static void do_cmd_bunshou(void)
        {
                strcpy(bunshou, tmp);
 
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, bunshou);
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, bunshou);
        }
 }
 
@@ -881,7 +881,7 @@ static void do_cmd_last_get(void)
        turn_tmp = current_world_ptr->game_turn;
        current_world_ptr->game_turn = record_turn;
        sprintf(buf,_("%sを手に入れた。", "descover %s."), record_o_name);
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, buf);
+       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, buf);
        current_world_ptr->game_turn = turn_tmp;
 }
 

diff --git a/src/cmd-dump.h b/src/cmd-dump.h
index 73fcde9..c5cda98 100644 (file)
--- a/src/cmd-dump.h
+++ b/src/cmd-dump.h
@@ -48,7 +48,7 @@
 #ifndef JP
 extern concptr get_ordinal_number_suffix(int num);
 #endif
-extern errr do_cmd_write_nikki(int type, int num, concptr note);
+extern errr do_cmd_write_nikki(player_type *creature_ptr, int type, int num, concptr note);
 extern void do_cmd_nikki(void);
 extern void do_cmd_redraw(void);
 extern void do_cmd_player_status(void);

diff --git a/src/cmd-gameoption.c b/src/cmd-gameoption.c
index 8864a89..61d7043 100644 (file)
--- a/src/cmd-gameoption.c
+++ b/src/cmd-gameoption.c
@@ -1104,7 +1104,7 @@ static void do_cmd_options_cheat(concptr info)
                case '6':
                {
                        if (!p_ptr->noscore)
-                               do_cmd_write_nikki(NIKKI_BUNSHOU, 0,
+                               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0,
                                        _("詐欺オプションをONにして、スコアを残せなくなった。", "give up sending score to use cheating options."));
                        p_ptr->noscore |= (cheat_info[k].o_set * 256 + cheat_info[k].o_bit);
                        (*cheat_info[k].o_var) = TRUE;

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index fce80c8..2fd2f3a 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -225,7 +225,7 @@ void do_cmd_pet_dismiss(void)
                                GAME_TEXT m_name[MAX_NLEN];
 
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);
+                               do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);
                        }
 
                        if (pet_ctr == p_ptr->riding)
@@ -450,7 +450,7 @@ static void do_name_pet(void)
                                if (record_named_pet)
                                {
                                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name);
+                                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name);
                                }
                        }
                        else
@@ -458,7 +458,7 @@ static void do_name_pet(void)
                                if (record_named_pet && old_name)
                                {
                                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name);
+                                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name);
                                }
                                m_ptr->nickname = 0;
                        }

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index 44e9c44..8a6a6dc 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -772,7 +772,7 @@ static void change_realm2(CHARACTER_IDX next_realm)
        p_ptr->spell_forgotten2 = 0L;
 
        sprintf(tmp, _("魔法の領域を%sから%sに変更した。", "change magic realm from %s to %s."), realm_names[p_ptr->realm2], realm_names[next_realm]);
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, tmp);
+       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, tmp);
        p_ptr->old_realm |= 1 << (p_ptr->realm2 - 1);
        p_ptr->realm2 = next_realm;
 

diff --git a/src/core.c b/src/core.c
index d42f076..50f6460 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -672,7 +672,7 @@ static void pattern_teleport(void)
 
        leave_quest_check();
 
-       if (record_stair) do_cmd_write_nikki(NIKKI_PAT_TELE, 0, NULL);
+       if (record_stair) do_cmd_write_nikki(p_ptr, NIKKI_PAT_TELE, 0, NULL);
 
        p_ptr->inside_quest = 0;
        free_turn(p_ptr);
@@ -2960,7 +2960,7 @@ static void process_world_aux_movement(void)
 
                                if (p_ptr->dungeon_idx) p_ptr->recall_dungeon = p_ptr->dungeon_idx;
                                if (record_stair)
-                                       do_cmd_write_nikki(NIKKI_RECALL, current_floor_ptr->dun_level, NULL);
+                                       do_cmd_write_nikki(p_ptr, NIKKI_RECALL, current_floor_ptr->dun_level, NULL);
 
                                current_floor_ptr->dun_level = 0;
                                p_ptr->dungeon_idx = 0;
@@ -2979,7 +2979,7 @@ static void process_world_aux_movement(void)
                                p_ptr->dungeon_idx = p_ptr->recall_dungeon;
 
                                if (record_stair)
-                                       do_cmd_write_nikki(NIKKI_RECALL, current_floor_ptr->dun_level, NULL);
+                                       do_cmd_write_nikki(p_ptr, NIKKI_RECALL, current_floor_ptr->dun_level, NULL);
 
                                /* New depth */
                                current_floor_ptr->dun_level = max_dlv[p_ptr->dungeon_idx];
@@ -3293,7 +3293,7 @@ static void process_world(void)
        {
                if (min != prev_min)
                {
-                       do_cmd_write_nikki(NIKKI_HIGAWARI, 0, NULL);
+                       do_cmd_write_nikki(p_ptr, NIKKI_HIGAWARI, 0, NULL);
                        determine_today_mon(FALSE);
                }
        }
@@ -3394,7 +3394,7 @@ static bool enter_wizard_mode(void)
                        return (FALSE);
                }
 
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "give up recording score to enter wizard mode."));
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "give up recording score to enter wizard mode."));
                /* Mark savefile */
                p_ptr->noscore |= 0x0002;
        }
@@ -3435,7 +3435,7 @@ static bool enter_debug_mode(void)
                        return (FALSE);
                }
 
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("デバッグモードに突入してスコアを残せなくなった。", "give up sending score to use debug commands."));
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("デバッグモードに突入してスコアを残せなくなった。", "give up sending score to use debug commands."));
                /* Mark savefile */
                p_ptr->noscore |= 0x0008;
        }
@@ -3476,7 +3476,7 @@ static bool enter_borg_mode(void)
                        return (FALSE);
                }
 
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("ボーグ・コマンドを使用してスコアを残せなくなった。", "give up recording score to use borg commands."));
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("ボーグ・コマンドを使用してスコアを残せなくなった。", "give up recording score to use borg commands."));
                /* Mark savefile */
                p_ptr->noscore |= 0x0010;
        }
@@ -4959,7 +4959,7 @@ static void dungeon(bool load_game)
        if ((max_dlv[p_ptr->dungeon_idx] < current_floor_ptr->dun_level) && !p_ptr->inside_quest)
        {
                max_dlv[p_ptr->dungeon_idx] = current_floor_ptr->dun_level;
-               if (record_maxdepth) do_cmd_write_nikki(NIKKI_MAXDEAPTH, current_floor_ptr->dun_level, NULL);
+               if (record_maxdepth) do_cmd_write_nikki(p_ptr, NIKKI_MAXDEAPTH, current_floor_ptr->dun_level, NULL);
        }
 
        (void)calculate_upkeep();
@@ -5421,7 +5421,7 @@ void play_game(bool new_game)
        {
                write_level = FALSE;
 
-               do_cmd_write_nikki(NIKKI_GAMESTART, 1, 
+               do_cmd_write_nikki(p_ptr, NIKKI_GAMESTART, 1, 
                                          _("                            ----ゲーム再開----",
                                                "                            ---- Restart Game ----"));
 
@@ -5545,7 +5545,7 @@ void play_game(bool new_game)
        {
                char buf[80];
                sprintf(buf, _("%sに降り立った。", "You are standing in the %s."), map_name());
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, buf);
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, buf);
        }
 
 

diff --git a/src/files.c b/src/files.c
index 5986794..c555df6 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -6035,7 +6035,7 @@ void do_cmd_save_and_exit(void)
 {
        p_ptr->playing = FALSE;
        p_ptr->leaving = TRUE;
-       do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
+       do_cmd_write_nikki(p_ptr, NIKKI_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
 }
 
 
@@ -7039,7 +7039,7 @@ static void handle_signal_abort(int sig)
 
        Term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ...", "Panic save..."));
 
-       do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ゲーム異常終了----", "---- Panic Save and Abort Game ----"));
+       do_cmd_write_nikki(p_ptr, NIKKI_GAMESTART, 0, _("----ゲーム異常終了----", "---- Panic Save and Abort Game ----"));
 
        /* Flush output */
        Term_fresh();

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 68ebc71..cb4fc29 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -1229,7 +1229,7 @@ static void generate_fixed_floor(void)
        current_floor_ptr->object_level = current_floor_ptr->base_level;
        current_floor_ptr->monster_level = current_floor_ptr->base_level;
 
-       if (record_stair) do_cmd_write_nikki(NIKKI_TO_QUEST, p_ptr->inside_quest, NULL);
+       if (record_stair) do_cmd_write_nikki(p_ptr, NIKKI_TO_QUEST, p_ptr->inside_quest, NULL);
        get_mon_num_prep(get_monster_hook(), NULL);
 
        init_flags = INIT_CREATE_DUNGEON;

diff --git a/src/floor-save.c b/src/floor-save.c
index e339cc0..31bd725 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -482,7 +482,7 @@ static void preserve_pet(void)
                        if (p_ptr->riding == i) continue;
 
                        monster_desc(m_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE);
-                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name);
                }
        }
 
@@ -626,7 +626,7 @@ static void place_pet(void)
                        if (record_named_pet && m_ptr->nickname)
                        {
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name);
+                               do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name);
                        }
 
                        /* Pre-calculated in precalc_cur_num_of_pet(), but need to decrease */

diff --git a/src/main-win.c b/src/main-win.c
index 8887eba..c955e5c 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -4863,7 +4863,7 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
 
                                /* Mega-Hack -- Delay death */
                                if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;
-                               do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
+                               do_cmd_write_nikki(p_ptr, NIKKI_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
 
                                /* Hardcode panic save */
                                p_ptr->panic_save = 1;

diff --git a/src/monster-process.c b/src/monster-process.c
index 8239759..6ba2ea4 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -1322,7 +1322,7 @@ void process_monster(MONSTER_IDX m_idx)
                {
                        GAME_TEXT m_name[MAX_NLEN];
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_LOSE_PARENT, m_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_LOSE_PARENT, m_name);
                }
 
                delete_monster_idx(m_idx);

diff --git a/src/monster-status.c b/src/monster-status.c
index a629770..1c00007 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1257,7 +1257,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, concptr note)
                {
                        char note_buf[160];
                        sprintf(note_buf, "%s%s", r_name + r_ptr->name, (m_ptr->smart & SM_CLONED) ? _("(クローン)", "(Clone)") : "");
-                       do_cmd_write_nikki(NIKKI_UNIQUE, 0, note_buf);
+                       do_cmd_write_nikki(p_ptr, NIKKI_UNIQUE, 0, note_buf);
                }
 
                /* Make a sound */

diff --git a/src/monster1.c b/src/monster1.c
index 27af5f7..cb61ba0 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -2560,7 +2560,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                GAME_TEXT m_name[MAX_NLEN];
 
                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-               do_cmd_write_nikki(NIKKI_NAMED_PET, 3, m_name);
+               do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, 3, m_name);
        }
 
        /* Let monsters explode! */
@@ -2619,7 +2619,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
                        monster_desc(m_name, m_ptr, MD_WRONGDOER_NAME);
 
-                       do_cmd_write_nikki(NIKKI_ARENA, p_ptr->arena_number, m_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_ARENA, p_ptr->arena_number, m_name);
                }
        }
 
@@ -3101,7 +3101,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
                play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR);
 
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("見事に変愚蛮怒の勝利者となった！", "become *WINNER* of Hengband finely!"));
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("見事に変愚蛮怒の勝利者となった！", "become *WINNER* of Hengband finely!"));
 
                admire_from_patron(p_ptr);
 

diff --git a/src/monster2.c b/src/monster2.c
index 3d3943d..fc72d29 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -340,7 +340,7 @@ void compact_monsters(int size)
                        {
                                GAME_TEXT m_name[MAX_NLEN];
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
+                               do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
                        }
 
                        delete_monster_idx(i);

diff --git a/src/mutation.c b/src/mutation.c
index dda6042..360e21e 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -2320,7 +2320,7 @@ bool mutation_power_aux(player_type *creature_ptr, int power)
                                        {
                                                GAME_TEXT m_name[MAX_NLEN];
                                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
+                                               do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
                                        }
                                        /* Delete the monster, rather than killing it. */
                                        delete_monster_idx(g_ptr->m_idx);

diff --git a/src/object2.c b/src/object2.c
index cdef806..e98c008 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -760,7 +760,7 @@ void object_aware(object_type *o_ptr)
                q_ptr->number = 1;
                object_desc(o_name, q_ptr, OD_NAME_ONLY);
                
-               do_cmd_write_nikki(NIKKI_HANMEI, 0, o_name);
+               do_cmd_write_nikki(p_ptr, NIKKI_HANMEI, 0, o_name);
        }
 }
 

diff --git a/src/patron.c b/src/patron.c
index 071e5de..c99f598 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -668,7 +668,7 @@ void gain_level_reward(player_type *creature_ptr, int chosen_reward)
        }
        if (reward)
        {
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, format(_("パトロンの報酬で%s", "The patron rewards you with %s."), reward));
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, format(_("パトロンの報酬で%s", "The patron rewards you with %s."), reward));
        }
 }
 

diff --git a/src/player-damage.c b/src/player-damage.c
index dc43763..18563fd 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -505,7 +505,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
                        concptr m_name = r_name + r_info[arena_info[creature_ptr->arena_number].r_idx].name;
                        msg_format(_("あなたは%sの前に敗れ去った。", "You are beaten by %s."), m_name);
                        msg_print(NULL);
-                       if (record_arena) do_cmd_write_nikki(NIKKI_ARENA, -1 - creature_ptr->arena_number, m_name);
+                       if (record_arena) do_cmd_write_nikki(p_ptr, NIKKI_ARENA, -1 - creature_ptr->arena_number, m_name);
                }
                else
                {
@@ -544,7 +544,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
 
                        if (winning_seppuku)
                        {
-                               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("勝利の後切腹した。", "did Seppuku after the winning."));
+                               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("勝利の後切腹した。", "did Seppuku after the winning."));
                        }
                        else
                        {
@@ -561,11 +561,11 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
                                        sprintf(buf, _("%d階", "level %d"), (int)current_floor_ptr->dun_level);
 
                                sprintf(tmp, _("%sで%sに殺された。", "killed by %s %s."), buf, creature_ptr->died_from);
-                               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, tmp);
+                               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, tmp);
                        }
 
-                       do_cmd_write_nikki(NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
-                       do_cmd_write_nikki(NIKKI_BUNSHOU, 1, "\n\n\n\n");
+                       do_cmd_write_nikki(p_ptr, NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
+                       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 1, "\n\n\n\n");
 
                        flush();
 
@@ -700,7 +700,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp
                                hit_from = _("何か", "something");
 
                        sprintf(tmp, _("%sによってピンチに陥った。", "A critical situation because of %s."), hit_from);
-                       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, tmp);
+                       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, tmp);
                }
 
                if (auto_more)

diff --git a/src/player-status.c b/src/player-status.c
index 9a80061..ca558a0 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -5545,7 +5545,7 @@ void check_experience(player_type *creature_ptr)
                        }
                        level_inc_stat = TRUE;
 
-                       do_cmd_write_nikki(NIKKI_LEVELUP, creature_ptr->lev, NULL);
+                       do_cmd_write_nikki(p_ptr, NIKKI_LEVELUP, creature_ptr->lev, NULL);
                }
 
                sound(SOUND_LEVEL);
@@ -5878,7 +5878,7 @@ void cheat_death(player_type *creature_ptr)
        creature_ptr->wild_mode = FALSE;
        creature_ptr->leaving = TRUE;
 
-       do_cmd_write_nikki(NIKKI_BUNSHOU, 1,
+       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 1,
                _("                            しかし、生き返った。",
                        "                            but revived."));
 

diff --git a/src/quest.c b/src/quest.c
index be6acc9..2f0b0e8 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -87,10 +87,10 @@ void complete_quest(QUEST_IDX quest_num)
        switch (q_ptr->type)
        {
        case QUEST_TYPE_RANDOM:
-               if (record_rand_quest) do_cmd_write_nikki(NIKKI_RAND_QUEST_C, quest_num, NULL);
+               if (record_rand_quest) do_cmd_write_nikki(p_ptr, NIKKI_RAND_QUEST_C, quest_num, NULL);
                break;
        default:
-               if (record_fix_quest) do_cmd_write_nikki(NIKKI_FIX_QUEST_C, quest_num, NULL);
+               if (record_fix_quest) do_cmd_write_nikki(p_ptr, NIKKI_FIX_QUEST_C, quest_num, NULL);
                break;
        }
 
@@ -485,11 +485,11 @@ void leave_quest_check(void)
                        /* Record finishing a quest */
                        if (q_ptr->type == QUEST_TYPE_RANDOM)
                        {
-                               if (record_rand_quest) do_cmd_write_nikki(NIKKI_RAND_QUEST_F, leaving_quest, NULL);
+                               if (record_rand_quest) do_cmd_write_nikki(p_ptr, NIKKI_RAND_QUEST_F, leaving_quest, NULL);
                        }
                        else
                        {
-                               if (record_fix_quest) do_cmd_write_nikki(NIKKI_FIX_QUEST_F, leaving_quest, NULL);
+                               if (record_fix_quest) do_cmd_write_nikki(p_ptr, NIKKI_FIX_QUEST_F, leaving_quest, NULL);
                        }
                }
        }

diff --git a/src/scores.c b/src/scores.c
index 5104cc2..4707364 100644 (file)
--- a/src/scores.c
+++ b/src/scores.c
@@ -911,9 +911,9 @@ void kingly(void)
        /* If player did Seppuku, that is already written in playrecord */
        if (!seppuku)
        {
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("ダンジョンの探索から引退した。", "retired exploring dungeons."));
-               do_cmd_write_nikki(NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
-               do_cmd_write_nikki(NIKKI_BUNSHOU, 1, "\n\n\n\n");
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("ダンジョンの探索から引退した。", "retired exploring dungeons."));
+               do_cmd_write_nikki(p_ptr, NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
+               do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 1, "\n\n\n\n");
        }
 
        /* Flush input */

diff --git a/src/spells-floor.c b/src/spells-floor.c
index 54d4528..0672d7c 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -543,7 +543,7 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
                                                GAME_TEXT m_name[MAX_NLEN];
 
                                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DESTROY, m_name);
+                                               do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_DESTROY, m_name);
                                        }
 
                                        /* Delete the monster (if any) */
@@ -1015,7 +1015,7 @@ bool earthquake(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx)
                                                                char m2_name[MAX_NLEN];
 
                                                                monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
-                                                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_EARTHQUAKE, m2_name);
+                                                               do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_EARTHQUAKE, m2_name);
                                                        }
                                                }
 

diff --git a/src/spells1.c b/src/spells1.c
index aa30002..3ca4871 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -3848,7 +3848,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        char m2_name[MAX_NLEN];
 
                        monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
-                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
                }
 
                delete_monster_idx(g_ptr->m_idx);

diff --git a/src/spells2.c b/src/spells2.c
index 6fcf127..f4be46b 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -1044,7 +1044,7 @@ bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side,
                        GAME_TEXT m_name[MAX_NLEN];
 
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
                }
 
                delete_monster_idx(m_idx);
@@ -1411,7 +1411,7 @@ void discharge_minion(void)
                        GAME_TEXT m_name[MAX_NLEN];
 
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_BLAST, m_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_BLAST, m_name);
                }
 
                delete_monster_idx(i);

diff --git a/src/spells3.c b/src/spells3.c
index aebc817..9d4aaa8 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -677,7 +677,7 @@ void teleport_level(MONSTER_IDX m_idx)
                                p_ptr->oldpx = p_ptr->x;
                        }
 
-                       if (record_stair) do_cmd_write_nikki(NIKKI_TELE_LEV, 1, NULL);
+                       if (record_stair) do_cmd_write_nikki(p_ptr, NIKKI_TELE_LEV, 1, NULL);
 
                        if (autosave_l) do_cmd_save_game(TRUE);
 
@@ -706,7 +706,7 @@ void teleport_level(MONSTER_IDX m_idx)
 
                if (m_idx <= 0) /* To player */
                {
-                       if (record_stair) do_cmd_write_nikki(NIKKI_TELE_LEV, -1, NULL);
+                       if (record_stair) do_cmd_write_nikki(p_ptr, NIKKI_TELE_LEV, -1, NULL);
 
                        if (autosave_l) do_cmd_save_game(TRUE);
 
@@ -728,7 +728,7 @@ void teleport_level(MONSTER_IDX m_idx)
 
                if (m_idx <= 0) /* To player */
                {
-                       if (record_stair) do_cmd_write_nikki(NIKKI_TELE_LEV, -1, NULL);
+                       if (record_stair) do_cmd_write_nikki(p_ptr, NIKKI_TELE_LEV, -1, NULL);
 
                        if (autosave_l) do_cmd_save_game(TRUE);
 
@@ -748,7 +748,7 @@ void teleport_level(MONSTER_IDX m_idx)
                {
                        /* Never reach this code on the surface */
                        /* if (!current_floor_ptr->dun_level) p_ptr->dungeon_idx = p_ptr->recall_dungeon; */
-                       if (record_stair) do_cmd_write_nikki(NIKKI_TELE_LEV, 1, NULL);
+                       if (record_stair) do_cmd_write_nikki(p_ptr, NIKKI_TELE_LEV, 1, NULL);
                        if (autosave_l) do_cmd_save_game(TRUE);
 
                        prepare_change_floor_mode(CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT);
@@ -768,7 +768,7 @@ void teleport_level(MONSTER_IDX m_idx)
                        char m2_name[MAX_NLEN];
 
                        monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
-                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_TELE_LEVEL, m2_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_TELE_LEVEL, m2_name);
                }
 
                delete_monster_idx(m_idx);
@@ -803,7 +803,7 @@ bool recall_player(player_type *creature_ptr, TIME_EFFECT turns)
                {
                        max_dlv[p_ptr->dungeon_idx] = current_floor_ptr->dun_level;
                        if (record_maxdepth)
-                               do_cmd_write_nikki(NIKKI_TRUMP, p_ptr->dungeon_idx, _("帰還のときに", "when recall from dungeon"));
+                               do_cmd_write_nikki(p_ptr, NIKKI_TRUMP, p_ptr->dungeon_idx, _("帰還のときに", "when recall from dungeon"));
                }
 
        }
@@ -856,7 +856,7 @@ bool free_level_recall(player_type *creature_ptr)
                creature_ptr->recall_dungeon = select_dungeon;
                max_dlv[creature_ptr->recall_dungeon] = ((amt > d_info[select_dungeon].maxdepth) ? d_info[select_dungeon].maxdepth : ((amt < d_info[select_dungeon].mindepth) ? d_info[select_dungeon].mindepth : amt));
                if (record_maxdepth)
-                       do_cmd_write_nikki(NIKKI_TRUMP, select_dungeon, _("トランプタワーで", "at Trump Tower"));
+                       do_cmd_write_nikki(p_ptr, NIKKI_TRUMP, select_dungeon, _("トランプタワーで", "at Trump Tower"));
 
                msg_print(_("回りの大気が張りつめてきた...", "The air about you becomes charged..."));
 
@@ -906,7 +906,7 @@ bool reset_recall(void)
                max_dlv[select_dungeon] = dummy;
 
                if (record_maxdepth)
-                       do_cmd_write_nikki(NIKKI_TRUMP, select_dungeon, _("フロア・リセットで", "using a scroll of reset recall"));
+                       do_cmd_write_nikki(p_ptr, NIKKI_TRUMP, select_dungeon, _("フロア・リセットで", "using a scroll of reset recall"));
                                        /* Accept request */
 #ifdef JP
                msg_format("%sの帰還レベルを %d 階にセット。", d_name+d_info[select_dungeon].name, dummy, dummy * 50);
@@ -1667,7 +1667,7 @@ bool artifact_scroll(void)
                if (record_rand_art)
                {
                        object_desc(o_name, o_ptr, OD_NAME_ONLY);
-                       do_cmd_write_nikki(NIKKI_ART_SCROLL, 0, o_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_ART_SCROLL, 0, o_name);
                }
                chg_virtue(p_ptr, V_ENCHANT, 1);
        }
@@ -1714,9 +1714,9 @@ bool identify_item(object_type *o_ptr)
        object_desc(o_name, o_ptr, OD_NAME_ONLY);
 
        if(record_fix_art && !old_known && object_is_fixed_artifact(o_ptr))
-               do_cmd_write_nikki(NIKKI_ART, 0, o_name);
+               do_cmd_write_nikki(p_ptr, NIKKI_ART, 0, o_name);
        if(record_rand_art && !old_known && o_ptr->art_name)
-               do_cmd_write_nikki(NIKKI_ART, 0, o_name);
+               do_cmd_write_nikki(p_ptr, NIKKI_ART, 0, o_name);
 
        return old_known;
 }

diff --git a/src/store.c b/src/store.c
index 3fdce5c..af50de4 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -4739,10 +4739,10 @@ static void store_purchase(void)
                                strcpy(record_o_name, o_name);
                                record_turn = current_world_ptr->game_turn;
 
-                               if (record_buy) do_cmd_write_nikki(NIKKI_BUY, 0, o_name);
+                               if (record_buy) do_cmd_write_nikki(p_ptr, NIKKI_BUY, 0, o_name);
                                object_desc(o_name, o_ptr, OD_NAME_ONLY);
                                if(record_rand_art && o_ptr->art_name)
-                                       do_cmd_write_nikki(NIKKI_ART, 0, o_name);
+                                       do_cmd_write_nikki(p_ptr, NIKKI_ART, 0, o_name);
 
                                /* Erase the inscription */
                                j_ptr->inscription = 0;
@@ -5073,7 +5073,7 @@ static void store_sell(void)
                        /* Describe the result (in message buffer) */
                        msg_format(_("%sを $%ldで売却しました。", "You sold %s for %ld gold."), o_name, (long)price);
 
-                       if (record_sell) do_cmd_write_nikki(NIKKI_SELL, 0, o_name);
+                       if (record_sell) do_cmd_write_nikki(p_ptr, NIKKI_SELL, 0, o_name);
 
                        if (!((o_ptr->tval == TV_FIGURINE) && (value > 0)))
                        {

diff --git a/src/trap.c b/src/trap.c
index 1f2d01e..210fcb4 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -443,7 +443,7 @@ void hit_trap(bool break_trap)
                        if (autosave_l && (p_ptr->chp >= 0))
                                do_cmd_save_game(TRUE);
 
-                       do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("落とし戸に落ちた", "You have fallen through a trap door!"));
+                       do_cmd_write_nikki(p_ptr, NIKKI_BUNSHOU, 0, _("落とし戸に落ちた", "You have fallen through a trap door!"));
                        prepare_change_floor_mode(CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT);
                        p_ptr->leaving = TRUE;
                }

diff --git a/src/util.c b/src/util.c
index 7c44207..4468485 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -3058,7 +3058,7 @@ void msg_print_wizard(int cheat_type, concptr msg)
 
        if (cheat_diary_output)
        {
-               do_cmd_write_nikki(NIKKI_WIZARD_LOG, 0, buf);
+               do_cmd_write_nikki(p_ptr, NIKKI_WIZARD_LOG, 0, buf);
        }
 
 }

diff --git a/src/wizard2.c b/src/wizard2.c
index e6964c1..6385283 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1357,7 +1357,7 @@ static void do_cmd_wiz_jump(void)
 
        leave_quest_check();
 
-       if (record_stair) do_cmd_write_nikki(NIKKI_WIZ_TELE,0,NULL);
+       if (record_stair) do_cmd_write_nikki(p_ptr, NIKKI_WIZ_TELE,0,NULL);
 
        p_ptr->inside_quest = 0;
        free_turn(p_ptr);
@@ -1474,7 +1474,7 @@ static void do_cmd_wiz_zap(void)
                                GAME_TEXT m_name[MAX_NLEN];
 
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
+                               do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
                        }
 
                        delete_monster_idx(i);
@@ -1506,7 +1506,7 @@ static void do_cmd_wiz_zap_all(void)
                        GAME_TEXT m_name[MAX_NLEN];
 
                        monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
+                       do_cmd_write_nikki(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
                }
 
                /* Delete this monster */