From 28c645f41c42c9ef2eff0479311ac7a2f69a2a76 Mon Sep 17 00:00:00 2001 From: Hourier Date: Tue, 14 Jan 2020 22:52:45 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20NIKKI=5F*=20=E3=82=92DIARY?= =?utf8?q?=5F*=20=E3=81=AB=E6=94=B9=E5=90=8D=20/=20Changed=20NIKKI=5F*=20t?= =?utf8?q?o=20DIARY=5F*?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/birth.c | 14 +++++------ src/bldg.c | 12 ++++----- src/cmd/cmd-basic.c | 12 ++++----- src/cmd/cmd-dump.c | 64 ++++++++++++++++++++++++------------------------ src/cmd/cmd-dump.h | 51 +++++++++++++++++++------------------- src/cmd/cmd-gameoption.c | 2 +- src/cmd/cmd-pet.c | 6 ++--- src/cmd/cmd-spell.c | 2 +- src/core.c | 18 +++++++------- src/files.c | 4 +-- src/floor-generate.c | 2 +- src/floor-save.c | 4 +-- src/main-win.c | 2 +- src/monster-process.c | 2 +- src/monster-status.c | 2 +- src/monster1.c | 6 ++--- src/monster2.c | 2 +- src/mutation.c | 2 +- src/object2.c | 2 +- src/patron.c | 2 +- src/player-damage.c | 12 ++++----- src/player-status.c | 4 +-- src/quest.c | 8 +++--- src/scores.c | 6 ++--- src/spells-floor.c | 4 +-- src/spells1.c | 2 +- src/spells2.c | 4 +-- src/spells3.c | 22 ++++++++--------- src/store.c | 6 ++--- src/trap.c | 2 +- src/util.c | 2 +- src/wizard2.c | 6 ++--- 32 files changed, 144 insertions(+), 145 deletions(-) diff --git a/src/birth.c b/src/birth.c index 7c8969ed8..6011a40d7 100644 --- a/src/birth.c +++ b/src/birth.c @@ -4593,26 +4593,26 @@ void player_birth(player_type *creature_ptr) message_add(" "); message_add(" "); - exe_write_diary(creature_ptr, NIKKI_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "-------- Start New Game --------")); - exe_write_diary(creature_ptr, NIKKI_HIGAWARI, 0, NULL); + exe_write_diary(creature_ptr, DIARY_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "-------- Start New Game --------")); + exe_write_diary(creature_ptr, DIARY_DIALY, 0, NULL); sprintf(buf, _(" 性別に%sを選択した。", " choose %s personality."), sex_info[creature_ptr->psex].title); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, buf); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf); sprintf(buf, _(" 種族に%sを選択した。", " choose %s race."), race_info[creature_ptr->prace].title); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, buf); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf); sprintf(buf, _(" 職業に%sを選択した。", " choose %s class."), class_info[creature_ptr->pclass].title); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, buf); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 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]) : ""); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, buf); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf); } sprintf(buf, _(" 性格に%sを選択した。", " choose %s."), seikaku_info[creature_ptr->pseikaku].title); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, buf); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, buf); /* Init the shops */ for (i = 1; i < max_towns; i++) diff --git a/src/bldg.c b/src/bldg.c index d7121842c..29bc224ea 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -2119,9 +2119,9 @@ static bool inn_comm(player_type *customer_ptr, int cmd) extract_day_hour_min(customer_ptr, &prev_day, &prev_hour, &prev_min); if ((prev_hour >= 6) && (prev_hour <= 17)) - exe_write_diary(customer_ptr, NIKKI_BUNSHOU, 0, _("宿屋に泊まった。", "stay over daytime at the inn.")); + exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("宿屋に泊まった。", "stay over daytime at the inn.")); else - exe_write_diary(customer_ptr, NIKKI_BUNSHOU, 0, _("宿屋に泊まった。", "stay over night at the inn.")); + exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 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) @@ -2132,7 +2132,7 @@ static bool inn_comm(player_type *customer_ptr, int cmd) prevent_turn_overflow(); - if ((prev_hour >= 18) && (prev_hour <= 23)) exe_write_diary(customer_ptr, NIKKI_HIGAWARI, 0, NULL); + if ((prev_hour >= 18) && (prev_hour <= 23)) exe_write_diary(customer_ptr, DIARY_DIALY, 0, NULL); customer_ptr->chp = customer_ptr->mhp; if (ironman_nightmare) @@ -2147,7 +2147,7 @@ static bool inn_comm(player_type *customer_ptr, int cmd) } msg_print(_("あなたは絶叫して目を覚ました。", "You awake screaming.")); - exe_write_diary(customer_ptr, NIKKI_BUNSHOU, 0, _("悪夢にうなされてよく眠れなかった。", "be troubled by a nightmare.")); + exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("悪夢にうなされてよく眠れなかった。", "be troubled by a nightmare.")); break; } @@ -2173,12 +2173,12 @@ static bool inn_comm(player_type *customer_ptr, int cmd) if ((prev_hour >= 6) && (prev_hour <= 17)) { msg_print(_("あなたはリフレッシュして目覚め、夕方を迎えた。", "You awake refreshed for the evening.")); - exe_write_diary(customer_ptr, NIKKI_BUNSHOU, 0, _("夕方を迎えた。", "awake refreshed.")); + exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("夕方を迎えた。", "awake refreshed.")); break; } msg_print(_("あなたはリフレッシュして目覚め、新たな日を迎えた。", "You awake refreshed for the new day.")); - exe_write_diary(customer_ptr, NIKKI_BUNSHOU, 0, _("すがすがしい朝を迎えた。", "awake refreshed.")); + exe_write_diary(customer_ptr, DIARY_DESCRIPTION, 0, _("すがすがしい朝を迎えた。", "awake refreshed.")); break; } case BACT_RUMORS: /* Listen for rumors */ diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c index 2729b9379..d347ca31b 100644 --- a/src/cmd/cmd-basic.c +++ b/src/cmd/cmd-basic.c @@ -307,7 +307,7 @@ void do_cmd_go_up(player_type *creature_ptr) if (creature_ptr->current_floor_ptr->dun_level - up_num < d_info[creature_ptr->dungeon_idx].mindepth) up_num = creature_ptr->current_floor_ptr->dun_level; } - if (record_stair) exe_write_diary(creature_ptr, NIKKI_STAIR, 0-up_num, _("階段を上った", "climbed up the stairs to")); + if (record_stair) exe_write_diary(creature_ptr, DIARY_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)) @@ -440,8 +440,8 @@ void do_cmd_go_down(player_type *creature_ptr) if (record_stair) { - if (fall_trap) exe_write_diary(creature_ptr, NIKKI_STAIR, down_num, _("落とし戸に落ちた", "fell through a trap door")); - else exe_write_diary(creature_ptr, NIKKI_STAIR, down_num, _("階段を下りた", "climbed down the stairs to")); + if (fall_trap) exe_write_diary(creature_ptr, DIARY_STAIR, down_num, _("落とし戸に落ちた", "fell through a trap door")); + else exe_write_diary(creature_ptr, DIARY_STAIR, down_num, _("階段を下りた", "climbed down the stairs to")); } if (fall_trap) @@ -2880,9 +2880,9 @@ void do_cmd_suicide(player_type *creature_ptr) if (!current_world_ptr->total_winner) { - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, _("ダンジョンの探索に絶望して自殺した。", "give up all hope to commit suicide.")); - exe_write_diary(creature_ptr, NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "-------- Game Over --------")); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, "\n\n\n\n"); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("ダンジョンの探索に絶望して自殺した。", "give up all hope to commit suicide.")); + exe_write_diary(creature_ptr, DIARY_GAMESTART, 1, _("-------- ゲームオーバー --------", "-------- Game Over --------")); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n"); } /* Cause of death */ diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c index 8a2bb4c1a..f55057580 100644 --- a/src/cmd/cmd-dump.c +++ b/src/cmd/cmd-dump.c @@ -417,11 +417,11 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) if (disable_diary) return(-1); - if (type == NIKKI_FIX_QUEST_C || - type == NIKKI_FIX_QUEST_F || - type == NIKKI_RAND_QUEST_C || - type == NIKKI_RAND_QUEST_F || - type == NIKKI_TO_QUEST) + if (type == DIARY_FIX_QUEST_C || + type == DIARY_FIX_QUEST_F || + type == DIARY_RAND_QUEST_C || + type == DIARY_RAND_QUEST_F || + type == DIARY_TO_QUEST) { QUEST_IDX old_quest; @@ -479,14 +479,14 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) switch (type) { - case NIKKI_HIGAWARI: + case DIARY_DIALY: { if (day < MAX_DAYS) fprintf(fff, _("%d日目\n", "Day %d\n"), day); else fputs(_("*****日目\n", "Day *****\n"), fff); do_level = FALSE; break; } - case NIKKI_BUNSHOU: + case DIARY_DESCRIPTION: { if (num) { @@ -497,36 +497,36 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) fprintf(fff, " %2d:%02d %20s %s\n", hour, min, note_level, note); break; } - case NIKKI_ART: + case DIARY_ART: { fprintf(fff, _(" %2d:%02d %20s %sを発見した。\n", " %2d:%02d %20s discovered %s.\n"), hour, min, note_level, note); break; } - case NIKKI_ART_SCROLL: + case DIARY_ART_SCROLL: { fprintf(fff, _(" %2d:%02d %20s 巻物によって%sを生成した。\n", " %2d:%02d %20s created %s by scroll.\n"), hour, min, note_level, note); break; } - case NIKKI_UNIQUE: + case DIARY_UNIQUE: { fprintf(fff, _(" %2d:%02d %20s %sを倒した。\n", " %2d:%02d %20s defeated %s.\n"), hour, min, note_level, note); break; } - case NIKKI_FIX_QUEST_C: + case DIARY_FIX_QUEST_C: { if (quest[num].flags & QUEST_FLAG_SILENT) break; fprintf(fff, _(" %2d:%02d %20s クエスト「%s」を達成した。\n", " %2d:%02d %20s completed quest '%s'.\n"), hour, min, note_level, quest[num].name); break; } - case NIKKI_FIX_QUEST_F: + case DIARY_FIX_QUEST_F: { if (quest[num].flags & QUEST_FLAG_SILENT) break; fprintf(fff, _(" %2d:%02d %20s クエスト「%s」から命からがら逃げ帰った。\n", " %2d:%02d %20s run away from quest '%s'.\n"), hour, min, note_level, quest[num].name); break; } - case NIKKI_RAND_QUEST_C: + case DIARY_RAND_QUEST_C: { GAME_TEXT name[MAX_NLEN]; strcpy(name, r_name + r_info[quest[num].r_idx].name); @@ -534,7 +534,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) " %2d:%02d %20s completed random quest '%s'\n"), hour, min, note_level, name); break; } - case NIKKI_RAND_QUEST_F: + case DIARY_RAND_QUEST_F: { GAME_TEXT name[MAX_NLEN]; strcpy(name, r_name + r_info[quest[num].r_idx].name); @@ -542,7 +542,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) " %2d:%02d %20s ran away from quest '%s'.\n"), hour, min, note_level, name); break; } - case NIKKI_MAXDEAPTH: + case DIARY_MAXDEAPTH: { 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, @@ -550,7 +550,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) _(num, d_name + d_info[creature_ptr->dungeon_idx].name)); break; } - case NIKKI_TRUMP: + case DIARY_TRUMP: { fprintf(fff, _(" %2d:%02d %20s %s%sの最深階を%d階にセットした。\n", " %2d:%02d %20s reset recall level of %s to %d %s.\n"), hour, min, note_level, note, @@ -558,7 +558,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) _((int)max_dlv[num], d_name + d_info[num].name)); break; } - case NIKKI_STAIR: + case DIARY_STAIR: { concptr to; if (q_idx && (is_fixed_quest_idx(q_idx) @@ -574,7 +574,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) fprintf(fff, _(" %2d:%02d %20s %sへ%s。\n", " %2d:%02d %20s %s %s.\n"), hour, min, note_level, _(to, note), _(note, to)); break; } - case NIKKI_RECALL: + case DIARY_RECALL: { if (!num) fprintf(fff, _(" %2d:%02d %20s 帰還を使って%sの%d階へ下りた。\n", " %2d:%02d %20s recalled to dungeon level %d of %s.\n"), @@ -584,30 +584,30 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) fprintf(fff, _(" %2d:%02d %20s 帰還を使って地上へと戻った。\n", " %2d:%02d %20s recalled from dungeon to surface.\n"), hour, min, note_level); break; } - case NIKKI_TO_QUEST: + case DIARY_TO_QUEST: { if (quest[num].flags & QUEST_FLAG_SILENT) break; fprintf(fff, _(" %2d:%02d %20s クエスト「%s」へと突入した。\n", " %2d:%02d %20s entered the quest '%s'.\n"), hour, min, note_level, quest[num].name); break; } - case NIKKI_TELE_LEV: + case DIARY_TELE_LEV: { fprintf(fff, _(" %2d:%02d %20s レベル・テレポートで脱出した。\n", " %2d:%02d %20s Got out using teleport level.\n"), hour, min, note_level); break; } - case NIKKI_BUY: + case DIARY_BUY: { fprintf(fff, _(" %2d:%02d %20s %sを購入した。\n", " %2d:%02d %20s bought %s.\n"), hour, min, note_level, note); break; } - case NIKKI_SELL: + case DIARY_SELL: { fprintf(fff, _(" %2d:%02d %20s %sを売却した。\n", " %2d:%02d %20s sold %s.\n"), hour, min, note_level, note); break; } - case NIKKI_ARENA: + case DIARY_ARENA: { if (num < 0) { @@ -627,12 +627,12 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) } break; } - case NIKKI_HANMEI: + case DIARY_FOUND: { fprintf(fff, _(" %2d:%02d %20s %sを識別した。\n", " %2d:%02d %20s identified %s.\n"), hour, min, note_level, note); break; } - case NIKKI_WIZ_TELE: + case DIARY_WIZ_TELE: { concptr to; if (!creature_ptr->current_floor_ptr->dun_level) @@ -644,7 +644,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) " %2d:%02d %20s wizard-teleport to %s.\n"), hour, min, note_level, to); break; } - case NIKKI_PAT_TELE: + case DIARY_PAT_TELE: { concptr to; if (!creature_ptr->current_floor_ptr->dun_level) @@ -656,12 +656,12 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) " %2d:%02d %20s used Pattern to teleport to %s.\n"), hour, min, note_level, to); break; } - case NIKKI_LEVELUP: + case DIARY_LEVELUP: { fprintf(fff, _(" %2d:%02d %20s レベルが%dに上がった。\n", " %2d:%02d %20s reached player level %d.\n"), hour, min, note_level, num); break; } - case NIKKI_GAMESTART: + case DIARY_GAMESTART: { time_t ct = time((time_t*)0); do_level = FALSE; @@ -673,7 +673,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) fprintf(fff, " %2d:%02d %20s %s %s", hour, min, note_level, note, ctime(&ct)); break; } - case NIKKI_NAMED_PET: + case DIARY_NAMED_PET: { fprintf(fff, " %2d:%02d %20s ", hour, min, note_level); switch (num) @@ -732,7 +732,7 @@ errr exe_write_diary(player_type *creature_ptr, int type, int num, concptr note) break; } - case NIKKI_WIZARD_LOG: + case DIARY_WIZARD_LOG: fprintf(fff, "%s\n", note); break; @@ -864,7 +864,7 @@ static void add_diary_note(player_type *creature_ptr) if (get_string(_("内容: ", "diary note: "), tmp, 79)) { strcpy(bunshou, tmp); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, bunshou); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, bunshou); } } @@ -883,7 +883,7 @@ static void do_cmd_last_get(player_type *creaute_ptr) GAME_TURN turn_tmp = current_world_ptr->game_turn; current_world_ptr->game_turn = record_turn; sprintf(buf, _("%sを手に入れた。", "descover %s."), record_o_name); - exe_write_diary(creaute_ptr, NIKKI_BUNSHOU, 0, buf); + exe_write_diary(creaute_ptr, DIARY_DESCRIPTION, 0, buf); current_world_ptr->game_turn = turn_tmp; } diff --git a/src/cmd/cmd-dump.h b/src/cmd/cmd-dump.h index c2e6f86dc..1296aaa13 100644 --- a/src/cmd/cmd-dump.h +++ b/src/cmd/cmd-dump.h @@ -1,31 +1,30 @@ #pragma once -#define NIKKI_HIGAWARI 0 -#define NIKKI_BUNSHOU 1 -#define NIKKI_ART 2 -#define NIKKI_UNIQUE 3 -#define NIKKI_FIX_QUEST_C 4 -#define NIKKI_FIX_QUEST_F 5 -#define NIKKI_RAND_QUEST_C 6 -#define NIKKI_RAND_QUEST_F 7 -#define NIKKI_MAXDEAPTH 8 -#define NIKKI_TRUMP 9 -#define NIKKI_STAIR 10 -#define NIKKI_RECALL 11 -#define NIKKI_TO_QUEST 12 -#define NIKKI_TELE_LEV 13 -#define NIKKI_BUY 14 -#define NIKKI_SELL 15 -#define NIKKI_ARENA 16 -#define NIKKI_HANMEI 17 -#define NIKKI_LEVELUP 18 -#define NIKKI_GAMESTART 19 -#define NIKKI_WIZ_TELE 20 -#define NIKKI_NAMED_PET 21 -#define NIKKI_PAT_TELE 22 -#define NIKKI_ART_SCROLL 23 - -#define NIKKI_WIZARD_LOG 24 +#define DIARY_DIALY 0 +#define DIARY_DESCRIPTION 1 +#define DIARY_ART 2 +#define DIARY_UNIQUE 3 +#define DIARY_FIX_QUEST_C 4 +#define DIARY_FIX_QUEST_F 5 +#define DIARY_RAND_QUEST_C 6 +#define DIARY_RAND_QUEST_F 7 +#define DIARY_MAXDEAPTH 8 +#define DIARY_TRUMP 9 +#define DIARY_STAIR 10 +#define DIARY_RECALL 11 +#define DIARY_TO_QUEST 12 +#define DIARY_TELEPORT_LEVEL 13 +#define DIARY_BUY 14 +#define DIARY_SELL 15 +#define DIARY_ARENA 16 +#define DIARY_FOUND 17 +#define DIARY_LEVELUP 18 +#define DIARY_GAMESTART 19 +#define DIARY_WIZ_TELE 20 +#define DIARY_NAMED_PET 21 +#define DIARY_PAT_TELE 22 +#define DIARY_ART_SCROLL 23 +#define DIARY_WIZARD_LOG 24 #define RECORD_NAMED_PET_NAME 0 #define RECORD_NAMED_PET_UNNAME 1 diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c index b231cc4f0..25e4d5720 100644 --- a/src/cmd/cmd-gameoption.c +++ b/src/cmd/cmd-gameoption.c @@ -1104,7 +1104,7 @@ static void do_cmd_options_cheat(concptr info) case '6': { if (!current_world_ptr->noscore) - exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, + exe_write_diary(p_ptr, DIARY_DESCRIPTION, 0, _("詐欺オプションをONにして、スコアを残せなくなった。", "give up sending score to use cheating options.")); current_world_ptr->noscore |= (cheat_info[k].o_set * 256 + cheat_info[k].o_bit); (*cheat_info[k].o_var) = TRUE; diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c index 655e6e29b..04b7b0d75 100644 --- a/src/cmd/cmd-pet.c +++ b/src/cmd/cmd-pet.c @@ -224,7 +224,7 @@ void do_cmd_pet_dismiss(player_type *creature_ptr) GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(creature_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name); + exe_write_diary(creature_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name); } if (pet_ctr == creature_ptr->riding) @@ -450,7 +450,7 @@ static void do_name_pet(player_type *creature_ptr) if (record_named_pet) { monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(creature_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name); + exe_write_diary(creature_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_NAME, m_name); } } else @@ -458,7 +458,7 @@ static void do_name_pet(player_type *creature_ptr) if (record_named_pet && old_name) { monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(creature_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name); + exe_write_diary(creature_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name); } m_ptr->nickname = 0; } diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c index 2759fbbdc..ac39fefbc 100644 --- a/src/cmd/cmd-spell.c +++ b/src/cmd/cmd-spell.c @@ -771,7 +771,7 @@ static void change_realm2(player_type *caster_ptr, CHARACTER_IDX next_realm) caster_ptr->spell_forgotten2 = 0L; sprintf(tmp, _("魔法の領域を%sから%sに変更した。", "change magic realm from %s to %s."), realm_names[caster_ptr->realm2], realm_names[next_realm]); - exe_write_diary(caster_ptr, NIKKI_BUNSHOU, 0, tmp); + exe_write_diary(caster_ptr, DIARY_DESCRIPTION, 0, tmp); caster_ptr->old_realm |= 1 << (caster_ptr->realm2 - 1); caster_ptr->realm2 = next_realm; diff --git a/src/core.c b/src/core.c index 8a4bdedcc..4e6b4fe53 100644 --- a/src/core.c +++ b/src/core.c @@ -671,7 +671,7 @@ static void pattern_teleport(player_type *creature_ptr) leave_quest_check(creature_ptr); - if (record_stair) exe_write_diary(creature_ptr, NIKKI_PAT_TELE, 0, NULL); + if (record_stair) exe_write_diary(creature_ptr, DIARY_PAT_TELE, 0, NULL); creature_ptr->current_floor_ptr->inside_quest = 0; free_turn(creature_ptr); @@ -2966,7 +2966,7 @@ static void process_world_aux_movement(player_type *creature_ptr) if (creature_ptr->dungeon_idx) creature_ptr->recall_dungeon = creature_ptr->dungeon_idx; if (record_stair) - exe_write_diary(creature_ptr, NIKKI_RECALL, floor_ptr->dun_level, NULL); + exe_write_diary(creature_ptr, DIARY_RECALL, floor_ptr->dun_level, NULL); floor_ptr->dun_level = 0; creature_ptr->dungeon_idx = 0; @@ -2985,7 +2985,7 @@ static void process_world_aux_movement(player_type *creature_ptr) creature_ptr->dungeon_idx = creature_ptr->recall_dungeon; if (record_stair) - exe_write_diary(creature_ptr, NIKKI_RECALL, floor_ptr->dun_level, NULL); + exe_write_diary(creature_ptr, DIARY_RECALL, floor_ptr->dun_level, NULL); /* New depth */ floor_ptr->dun_level = max_dlv[creature_ptr->dungeon_idx]; @@ -3297,7 +3297,7 @@ static void process_world(player_type *player_ptr) { if (min != prev_min) { - exe_write_diary(player_ptr, NIKKI_HIGAWARI, 0, NULL); + exe_write_diary(player_ptr, DIARY_DIALY, 0, NULL); determine_daily_bounty(player_ptr, FALSE); } } @@ -3398,7 +3398,7 @@ static bool enter_wizard_mode(void) return FALSE; } - exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "give up recording score to enter wizard mode.")); + exe_write_diary(p_ptr, DIARY_DESCRIPTION, 0, _("ウィザードモードに突入してスコアを残せなくなった。", "give up recording score to enter wizard mode.")); /* Mark savefile */ current_world_ptr->noscore |= 0x0002; } @@ -3439,7 +3439,7 @@ static bool enter_debug_mode(void) return FALSE; } - exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("デバッグモードに突入してスコアを残せなくなった。", "give up sending score to use debug commands.")); + exe_write_diary(p_ptr, DIARY_DESCRIPTION, 0, _("デバッグモードに突入してスコアを残せなくなった。", "give up sending score to use debug commands.")); /* Mark savefile */ current_world_ptr->noscore |= 0x0008; } @@ -4954,7 +4954,7 @@ static void dungeon(player_type *player_ptr, bool load_game) if ((max_dlv[player_ptr->dungeon_idx] < floor_ptr->dun_level) && !floor_ptr->inside_quest) { max_dlv[player_ptr->dungeon_idx] = floor_ptr->dun_level; - if (record_maxdepth) exe_write_diary(player_ptr, NIKKI_MAXDEAPTH, floor_ptr->dun_level, NULL); + if (record_maxdepth) exe_write_diary(player_ptr, DIARY_MAXDEAPTH, floor_ptr->dun_level, NULL); } (void)calculate_upkeep(player_ptr); @@ -5419,7 +5419,7 @@ void play_game(player_type *player_ptr, bool new_game) { write_level = FALSE; - exe_write_diary(player_ptr, NIKKI_GAMESTART, 1, + exe_write_diary(player_ptr, DIARY_GAMESTART, 1, _(" ----ゲーム再開----", " ---- Restart Game ----")); @@ -5541,7 +5541,7 @@ void play_game(player_type *player_ptr, bool new_game) { char buf[80]; sprintf(buf, _("%sに降り立った。", "You are standing in the %s."), map_name(player_ptr)); - exe_write_diary(player_ptr, NIKKI_BUNSHOU, 0, buf); + exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, buf); } /* Start game */ diff --git a/src/files.c b/src/files.c index 10bf76fb8..34ea615d4 100644 --- a/src/files.c +++ b/src/files.c @@ -5867,7 +5867,7 @@ void do_cmd_save_and_exit(player_type *creature_ptr) { creature_ptr->playing = FALSE; creature_ptr->leaving = TRUE; - exe_write_diary(creature_ptr, NIKKI_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----")); + exe_write_diary(creature_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----")); } @@ -6751,7 +6751,7 @@ static void handle_signal_abort(int sig) Term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ...", "Panic save...")); - exe_write_diary(p_ptr, NIKKI_GAMESTART, 0, _("----ゲーム異常終了----", "---- Panic Save and Abort Game ----")); + exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム異常終了----", "---- Panic Save and Abort Game ----")); Term_fresh(); p_ptr->panic_save = 1; diff --git a/src/floor-generate.c b/src/floor-generate.c index 02f8d790d..2824694e6 100644 --- a/src/floor-generate.c +++ b/src/floor-generate.c @@ -1249,7 +1249,7 @@ static void generate_fixed_floor(player_type *player_ptr) floor_ptr->object_level = floor_ptr->base_level; floor_ptr->monster_level = floor_ptr->base_level; - if (record_stair) exe_write_diary(player_ptr, NIKKI_TO_QUEST, floor_ptr->inside_quest, NULL); + if (record_stair) exe_write_diary(player_ptr, DIARY_TO_QUEST, floor_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 235105f4f..abdefe7cf 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -490,7 +490,7 @@ static void preserve_pet(player_type *master_ptr) if (master_ptr->riding == i) continue; monster_desc(m_name, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE); - exe_write_diary(master_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name); + exe_write_diary(master_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_MOVED, m_name); } } @@ -637,7 +637,7 @@ static void place_pet(player_type *master_ptr) if (record_named_pet && m_ptr->nickname) { monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(master_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, m_name); + exe_write_diary(master_ptr, DIARY_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 e798f29cc..90f1fb00b 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -4503,7 +4503,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; - exe_write_diary(p_ptr, NIKKI_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----")); + exe_write_diary(p_ptr, DIARY_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 894cba896..8ee1c55c2 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -1301,7 +1301,7 @@ void process_monster(player_type *target_ptr, MONSTER_IDX m_idx) { GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(target_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_LOSE_PARENT, m_name); + exe_write_diary(target_ptr, DIARY_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 369de102f..7d3d31906 100644 --- a/src/monster-status.c +++ b/src/monster-status.c @@ -1306,7 +1306,7 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo { char note_buf[160]; sprintf(note_buf, "%s%s", r_name + r_ptr->name, (m_ptr->smart & SM_CLONED) ? _("(クローン)", "(Clone)") : ""); - exe_write_diary(target_ptr, NIKKI_UNIQUE, 0, note_buf); + exe_write_diary(target_ptr, DIARY_UNIQUE, 0, note_buf); } /* Make a sound */ diff --git a/src/monster1.c b/src/monster1.c index 99cd302ec..7c6bca820 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -2572,7 +2572,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); - exe_write_diary(p_ptr, NIKKI_NAMED_PET, 3, m_name); + exe_write_diary(p_ptr, DIARY_NAMED_PET, 3, m_name); } /* Let monsters explode! */ @@ -2631,7 +2631,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item) monster_desc(m_name, m_ptr, MD_WRONGDOER_NAME); - exe_write_diary(p_ptr, NIKKI_ARENA, p_ptr->arena_number, m_name); + exe_write_diary(p_ptr, DIARY_ARENA, p_ptr->arena_number, m_name); } } @@ -3114,7 +3114,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item) play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR); - exe_write_diary(p_ptr, NIKKI_BUNSHOU, 0, _("見事に変愚蛮怒の勝利者となった！", "become *WINNER* of Hengband finely!")); + exe_write_diary(p_ptr, DIARY_DESCRIPTION, 0, _("見事に変愚蛮怒の勝利者となった！", "become *WINNER* of Hengband finely!")); admire_from_patron(p_ptr); diff --git a/src/monster2.c b/src/monster2.c index 21e2d1e02..ec5f315ee 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -322,7 +322,7 @@ void compact_monsters(int size) { GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name); + exe_write_diary(p_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name); } delete_monster_idx(i); diff --git a/src/mutation.c b/src/mutation.c index 16f0af2f7..30ec028ec 100644 --- a/src/mutation.c +++ b/src/mutation.c @@ -2320,7 +2320,7 @@ bool exe_mutation_power(player_type *creature_ptr, int power) { GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(creature_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name); + exe_write_diary(creature_ptr, DIARY_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 74396fcf7..cc3bf6888 100644 --- a/src/object2.c +++ b/src/object2.c @@ -537,7 +537,7 @@ void object_aware(player_type *owner_ptr, object_type *o_ptr) q_ptr->number = 1; object_desc(o_name, q_ptr, OD_NAME_ONLY); - exe_write_diary(owner_ptr, NIKKI_HANMEI, 0, o_name); + exe_write_diary(owner_ptr, DIARY_FOUND, 0, o_name); } diff --git a/src/patron.c b/src/patron.c index 6719ee14c..25ec5e824 100644 --- 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) { - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, format(_("パトロンの報酬で%s", "The patron rewards you with %s."), reward)); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, format(_("パトロンの報酬で%s", "The patron rewards you with %s."), reward)); } } diff --git a/src/player-damage.c b/src/player-damage.c index b61079d66..da2cb63b3 100644 --- a/src/player-damage.c +++ b/src/player-damage.c @@ -504,7 +504,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) exe_write_diary(creature_ptr, NIKKI_ARENA, -1 - creature_ptr->arena_number, m_name); + if (record_arena) exe_write_diary(creature_ptr, DIARY_ARENA, -1 - creature_ptr->arena_number, m_name); } else { @@ -543,7 +543,7 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp if (winning_seppuku) { - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, _("勝利の後切腹した。", "did Seppuku after the winning.")); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("勝利の後切腹した。", "did Seppuku after the winning.")); } else { @@ -560,11 +560,11 @@ int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concp sprintf(buf, _("%d階", "level %d"), (int)creature_ptr->current_floor_ptr->dun_level); sprintf(tmp, _("%sで%sに殺された。", "killed by %s %s."), buf, creature_ptr->died_from); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, tmp); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, tmp); } - exe_write_diary(creature_ptr, NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "-------- Game Over --------")); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, "\n\n\n\n"); + exe_write_diary(creature_ptr, DIARY_GAMESTART, 1, _("-------- ゲームオーバー --------", "-------- Game Over --------")); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n"); flush(); @@ -699,7 +699,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); - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, tmp); + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, tmp); } if (auto_more) diff --git a/src/player-status.c b/src/player-status.c index e639fcdbf..904576989 100644 --- a/src/player-status.c +++ b/src/player-status.c @@ -5555,7 +5555,7 @@ void check_experience(player_type *creature_ptr) } level_inc_stat = TRUE; - exe_write_diary(creature_ptr, NIKKI_LEVELUP, creature_ptr->lev, NULL); + exe_write_diary(creature_ptr, DIARY_LEVELUP, creature_ptr->lev, NULL); } sound(SOUND_LEVEL); @@ -5891,7 +5891,7 @@ void cheat_death(player_type *creature_ptr) creature_ptr->wild_mode = FALSE; creature_ptr->leaving = TRUE; - exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, + exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, _(" しかし、生き返った。", " but revived.")); diff --git a/src/quest.c b/src/quest.c index c84025fcb..def946bae 100644 --- a/src/quest.c +++ b/src/quest.c @@ -90,10 +90,10 @@ void complete_quest(player_type *player_ptr, QUEST_IDX quest_num) switch (q_ptr->type) { case QUEST_TYPE_RANDOM: - if (record_rand_quest) exe_write_diary(player_ptr, NIKKI_RAND_QUEST_C, quest_num, NULL); + if (record_rand_quest) exe_write_diary(player_ptr, DIARY_RAND_QUEST_C, quest_num, NULL); break; default: - if (record_fix_quest) exe_write_diary(player_ptr, NIKKI_FIX_QUEST_C, quest_num, NULL); + if (record_fix_quest) exe_write_diary(player_ptr, DIARY_FIX_QUEST_C, quest_num, NULL); break; } @@ -475,12 +475,12 @@ void leave_quest_check(player_type *player_ptr) if (q_ptr->type == QUEST_TYPE_RANDOM) { if (record_rand_quest) - exe_write_diary(player_ptr, NIKKI_RAND_QUEST_F, leaving_quest, NULL); + exe_write_diary(player_ptr, DIARY_RAND_QUEST_F, leaving_quest, NULL); return; } if (record_fix_quest) - exe_write_diary(player_ptr, NIKKI_FIX_QUEST_F, leaving_quest, NULL); + exe_write_diary(player_ptr, DIARY_FIX_QUEST_F, leaving_quest, NULL); } diff --git a/src/scores.c b/src/scores.c index 0592e1db4..f078827c6 100644 --- a/src/scores.c +++ b/src/scores.c @@ -875,9 +875,9 @@ void kingly(player_type *winner_ptr) /* If player did Seppuku, that is already written in playrecord */ if (!seppuku) { - exe_write_diary(winner_ptr, NIKKI_BUNSHOU, 0, _("ダンジョンの探索から引退した。", "retired exploring dungeons.")); - exe_write_diary(winner_ptr, NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "-------- Game Over --------")); - exe_write_diary(winner_ptr, NIKKI_BUNSHOU, 1, "\n\n\n\n"); + exe_write_diary(winner_ptr, DIARY_DESCRIPTION, 0, _("ダンジョンの探索から引退した。", "retired exploring dungeons.")); + exe_write_diary(winner_ptr, DIARY_GAMESTART, 1, _("-------- ゲームオーバー --------", "-------- Game Over --------")); + exe_write_diary(winner_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n"); } /* Flush input */ diff --git a/src/spells-floor.c b/src/spells-floor.c index bf9fd9a8e..48bcfd64f 100644 --- a/src/spells-floor.c +++ b/src/spells-floor.c @@ -523,7 +523,7 @@ bool destroy_area(player_type *caster_ptr, POSITION y1, POSITION x1, POSITION r, GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(caster_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_DESTROY, m_name); + exe_write_diary(caster_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_DESTROY, m_name); } /* Delete the monster (if any) */ @@ -998,7 +998,7 @@ bool earthquake(player_type *caster_ptr, POSITION cy, POSITION cx, POSITION r, M char m2_name[MAX_NLEN]; monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(caster_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_EARTHQUAKE, m2_name); + exe_write_diary(caster_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_EARTHQUAKE, m2_name); } } diff --git a/src/spells1.c b/src/spells1.c index e407ca6db..876642b7d 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -3854,7 +3854,7 @@ static bool project_m(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSI char m2_name[MAX_NLEN]; monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(caster_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name); + exe_write_diary(caster_ptr, DIARY_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 84a1a05f4..b2956aa1a 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -1082,7 +1082,7 @@ bool genocide_aux(player_type *caster_ptr, MONSTER_IDX m_idx, int power, bool pl GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(caster_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name); + exe_write_diary(caster_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name); } delete_monster_idx(m_idx); @@ -1442,7 +1442,7 @@ void discharge_minion(player_type *caster_ptr) GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(caster_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_BLAST, m_name); + exe_write_diary(caster_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_BLAST, m_name); } delete_monster_idx(i); diff --git a/src/spells3.c b/src/spells3.c index 2fbf85e42..c4096cd00 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -656,7 +656,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) creature_ptr->oldpx = creature_ptr->x; } - if (record_stair) exe_write_diary(creature_ptr, NIKKI_TELE_LEV, 1, NULL); + if (record_stair) exe_write_diary(creature_ptr, DIARY_TELE_LEV, 1, NULL); if (autosave_l) do_cmd_save_game(creature_ptr, TRUE); @@ -686,7 +686,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) if (m_idx <= 0) /* To player */ { - if (record_stair) exe_write_diary(creature_ptr, NIKKI_TELE_LEV, -1, NULL); + if (record_stair) exe_write_diary(creature_ptr, DIARY_TELE_LEV, -1, NULL); if (autosave_l) do_cmd_save_game(creature_ptr, TRUE); @@ -708,7 +708,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) if (m_idx <= 0) /* To player */ { - if (record_stair) exe_write_diary(creature_ptr, NIKKI_TELE_LEV, -1, NULL); + if (record_stair) exe_write_diary(creature_ptr, DIARY_TELE_LEV, -1, NULL); if (autosave_l) do_cmd_save_game(creature_ptr, TRUE); @@ -728,7 +728,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) { /* Never reach this code on the surface */ /* if (!creature_ptr->current_floor_ptr->dun_level) creature_ptr->dungeon_idx = creature_ptr->recall_dungeon; */ - if (record_stair) exe_write_diary(creature_ptr, NIKKI_TELE_LEV, 1, NULL); + if (record_stair) exe_write_diary(creature_ptr, DIARY_TELE_LEV, 1, NULL); if (autosave_l) do_cmd_save_game(creature_ptr, TRUE); prepare_change_floor_mode(creature_ptr, CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT); @@ -750,7 +750,7 @@ void teleport_level(player_type *creature_ptr, MONSTER_IDX m_idx) char m2_name[MAX_NLEN]; monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(creature_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_TELE_LEVEL, m2_name); + exe_write_diary(creature_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_TELE_LEVEL, m2_name); } delete_monster_idx(m_idx); @@ -789,7 +789,7 @@ bool recall_player(player_type *creature_ptr, TIME_EFFECT turns) { max_dlv[creature_ptr->dungeon_idx] = creature_ptr->current_floor_ptr->dun_level; if (record_maxdepth) - exe_write_diary(creature_ptr, NIKKI_TRUMP, creature_ptr->dungeon_idx, _("帰還のときに", "when recall from dungeon")); + exe_write_diary(creature_ptr, DIARY_TRUMP, creature_ptr->dungeon_idx, _("帰還のときに", "when recall from dungeon")); } } @@ -844,7 +844,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) - exe_write_diary(creature_ptr, NIKKI_TRUMP, select_dungeon, _("トランプタワーで", "at Trump Tower")); + exe_write_diary(creature_ptr, DIARY_TRUMP, select_dungeon, _("トランプタワーで", "at Trump Tower")); msg_print(_("回りの大気が張りつめてきた...", "The air about you becomes charged...")); @@ -896,7 +896,7 @@ bool reset_recall(player_type *caster_ptr) max_dlv[select_dungeon] = dummy; if (record_maxdepth) - exe_write_diary(caster_ptr, NIKKI_TRUMP, select_dungeon, _("フロア・リセットで", "using a scroll of reset recall")); + exe_write_diary(caster_ptr, DIARY_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); @@ -1624,7 +1624,7 @@ bool artifact_scroll(player_type *caster_ptr) if (record_rand_art) { object_desc(o_name, o_ptr, OD_NAME_ONLY); - exe_write_diary(caster_ptr, NIKKI_ART_SCROLL, 0, o_name); + exe_write_diary(caster_ptr, DIARY_ART_SCROLL, 0, o_name); } chg_virtue(caster_ptr, V_ENCHANT, 1); @@ -1668,9 +1668,9 @@ bool identify_item(player_type *owner_ptr, 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)) - exe_write_diary(owner_ptr, NIKKI_ART, 0, o_name); + exe_write_diary(owner_ptr, DIARY_ART, 0, o_name); if(record_rand_art && !old_known && o_ptr->art_name) - exe_write_diary(owner_ptr, NIKKI_ART, 0, o_name); + exe_write_diary(owner_ptr, DIARY_ART, 0, o_name); return old_known; } diff --git a/src/store.c b/src/store.c index ff37e1f99..1f9867ae0 100644 --- a/src/store.c +++ b/src/store.c @@ -4690,10 +4690,10 @@ static void store_purchase(player_type *player_ptr) strcpy(record_o_name, o_name); record_turn = current_world_ptr->game_turn; - if (record_buy) exe_write_diary(player_ptr, NIKKI_BUY, 0, o_name); + if (record_buy) exe_write_diary(player_ptr, DIARY_BUY, 0, o_name); object_desc(o_name, o_ptr, OD_NAME_ONLY); if (record_rand_art && o_ptr->art_name) - exe_write_diary(player_ptr, NIKKI_ART, 0, o_name); + exe_write_diary(player_ptr, DIARY_ART, 0, o_name); /* Erase the inscription */ j_ptr->inscription = 0; @@ -4956,7 +4956,7 @@ static void store_sell(player_type *owner_ptr) /* Describe the result (in message buffer) */ msg_format(_("%sを $%ldで売却しました。", "You sold %s for %ld gold."), o_name, (long)price); - if (record_sell) exe_write_diary(owner_ptr, NIKKI_SELL, 0, o_name); + if (record_sell) exe_write_diary(owner_ptr, DIARY_SELL, 0, o_name); if (!((o_ptr->tval == TV_FIGURINE) && (value > 0))) { diff --git a/src/trap.c b/src/trap.c index a8f98031e..a2eb0b948 100644 --- a/src/trap.c +++ b/src/trap.c @@ -448,7 +448,7 @@ void hit_trap(player_type *trapped_ptr, bool break_trap) if (autosave_l && (trapped_ptr->chp >= 0)) do_cmd_save_game(trapped_ptr, TRUE); - exe_write_diary(trapped_ptr, NIKKI_BUNSHOU, 0, _("落とし戸に落ちた", "You have fallen through a trap door!")); + exe_write_diary(trapped_ptr, DIARY_DESCRIPTION, 0, _("落とし戸に落ちた", "You have fallen through a trap door!")); prepare_change_floor_mode(trapped_ptr, CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT); trapped_ptr->leaving = TRUE; } diff --git a/src/util.c b/src/util.c index cd69261cc..384abbbb9 100644 --- a/src/util.c +++ b/src/util.c @@ -3036,7 +3036,7 @@ void msg_print_wizard(int cheat_type, concptr msg) if (cheat_diary_output) { - exe_write_diary(p_ptr, NIKKI_WIZARD_LOG, 0, buf); + exe_write_diary(p_ptr, DIARY_WIZARD_LOG, 0, buf); } } diff --git a/src/wizard2.c b/src/wizard2.c index f3f4db38b..543a8c49e 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -1424,7 +1424,7 @@ static void do_cmd_wiz_jump(player_type *creature_ptr) leave_quest_check(creature_ptr); - if (record_stair) exe_write_diary(creature_ptr, NIKKI_WIZ_TELE, 0, NULL); + if (record_stair) exe_write_diary(creature_ptr, DIARY_WIZ_TELE, 0, NULL); creature_ptr->current_floor_ptr->inside_quest = 0; free_turn(creature_ptr); @@ -1535,7 +1535,7 @@ static void do_cmd_wiz_zap(player_type *caster_ptr) GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(caster_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name); + exe_write_diary(caster_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name); } delete_monster_idx(i); @@ -1565,7 +1565,7 @@ static void do_cmd_wiz_zap_all(player_type *caster_ptr) GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(caster_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name); + exe_write_diary(caster_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name); } /* Delete this monster */ -- 2.11.0