[Refactor] #3339 DIARY_HOGE define 定数をenum class DiaryKind に変えた

diff --git a/src/action/mutation-execution.cpp b/src/action/mutation-execution.cpp
index 7227b71..4ec6d1d 100644 (file)
--- a/src/action/mutation-execution.cpp
+++ b/src/action/mutation-execution.cpp
@@ -265,7 +265,7 @@ bool exe_mutation_power(PlayerType *player_ptr, PlayerMutationType power)
         if (can_banish) {
             if (record_named_pet && monster.is_named_pet()) {
                 const auto m_name = monster_desc(player_ptr, &monster, MD_INDEF_VISIBLE);
-                exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
+                exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
             }
 
             delete_monster_idx(player_ptr, grid.m_idx);

diff --git a/src/birth/character-builder.cpp b/src/birth/character-builder.cpp
index c09af12..b3c1d05 100644 (file)
--- a/src/birth/character-builder.cpp
+++ b/src/birth/character-builder.cpp
@@ -58,31 +58,31 @@ static void write_birth_diary(PlayerType *player_ptr)
     message_add(" ");
     message_add("  ");
 
-    exe_write_diary(player_ptr, DIARY_GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "------- Started New Game -------"));
-    exe_write_diary(player_ptr, DIARY_DIALY, 0);
+    exe_write_diary(player_ptr, DiaryKind::GAMESTART, 1, _("-------- 新規ゲーム開始 --------", "------- Started New Game -------"));
+    exe_write_diary(player_ptr, DiaryKind::DIALY, 0);
     const auto mes_sex = format(_("%s性別に%sを選択した。", "%schose %s gender."), indent, sex_info[player_ptr->psex].title);
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, mes_sex);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, mes_sex);
     const auto mes_race = format(_("%s種族に%sを選択した。", "%schose %s race."), indent, race_info[enum2i(player_ptr->prace)].title);
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, mes_race);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, mes_race);
     const auto mes_class = format(_("%s職業に%sを選択した。", "%schose %s class."), indent, class_info[enum2i(player_ptr->pclass)].title);
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, mes_class);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, mes_class);
     if (player_ptr->realm1) {
         const std::string mes_realm2 = player_ptr->realm2 ? format(_("と%s", " and %s realms"), realm_names[player_ptr->realm2]) : _("", " realm");
         const auto mes_realm = format(_("%s魔法の領域に%s%sを選択した。", "%schose %s%s."), indent, realm_names[player_ptr->realm1], mes_realm2.data());
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, mes_realm);
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, mes_realm);
     }
 
     if (player_ptr->element) {
         const auto mes_element = format(_("%s元素系統に%sを選択した。", "%schose %s system."), indent, get_element_title(player_ptr->element));
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, mes_element);
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, mes_element);
     }
 
     const auto mes_personality = format(_("%s性格に%sを選択した。", "%schose %s personality."), indent, personality_info[player_ptr->ppersonality].title);
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, mes_personality);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, mes_personality);
     if (PlayerClass(player_ptr).equals(PlayerClassType::CHAOS_WARRIOR)) {
         const auto fmt_patron = _("%s守護神%sと契約を交わした。", "%smade a contract with patron %s.");
         const auto mes_patron = format(fmt_patron, indent, patron_list[player_ptr->chaos_patron].name.data());
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, mes_patron);
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, mes_patron);
     }
 }
 

diff --git a/src/cmd-action/cmd-move.cpp b/src/cmd-action/cmd-move.cpp
index 95044fc..c8b0660 100644 (file)
--- a/src/cmd-action/cmd-move.cpp
+++ b/src/cmd-action/cmd-move.cpp
@@ -170,7 +170,7 @@ void do_cmd_go_up(PlayerType *player_ptr)
     }
 
     if (record_stair) {
-        exe_write_diary(player_ptr, DIARY_STAIR, 0 - up_num, _("階段を上った", "climbed up the stairs to"));
+        exe_write_diary(player_ptr, DiaryKind::STAIR, 0 - up_num, _("階段を上った", "climbed up the stairs to"));
     }
 
     if (up_num == player_ptr->current_floor_ptr->dun_level) {
@@ -301,9 +301,9 @@ void do_cmd_go_down(PlayerType *player_ptr)
 
     if (record_stair) {
         if (fall_trap) {
-            exe_write_diary(player_ptr, DIARY_STAIR, down_num, _("落とし戸に落ちた", "fell through a trap door"));
+            exe_write_diary(player_ptr, DiaryKind::STAIR, down_num, _("落とし戸に落ちた", "fell through a trap door"));
         } else {
-            exe_write_diary(player_ptr, DIARY_STAIR, down_num, _("階段を下りた", "climbed down the stairs to"));
+            exe_write_diary(player_ptr, DiaryKind::STAIR, down_num, _("階段を下りた", "climbed down the stairs to"));
         }
     }
 

diff --git a/src/cmd-action/cmd-others.cpp b/src/cmd-action/cmd-others.cpp
index e259343..7ee4d8f 100644 (file)
--- a/src/cmd-action/cmd-others.cpp
+++ b/src/cmd-action/cmd-others.cpp
@@ -196,9 +196,9 @@ void do_cmd_suicide(PlayerType *player_ptr)
         add_retired_class(player_ptr->pclass);
     } else {
         play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_GAMEOVER);
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("ダンジョンの探索に絶望して自殺した。", "gave up all hope to commit suicide."));
-        exe_write_diary(player_ptr, DIARY_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n");
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, _("ダンジョンの探索に絶望して自殺した。", "gave up all hope to commit suicide."));
+        exe_write_diary(player_ptr, DiaryKind::GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, "\n\n\n\n");
     }
 
     player_ptr->died_from = _("途中終了", "Quitting");

diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp
index 7e5ac1d..2dd367d 100644 (file)
--- a/src/cmd-action/cmd-pet.cpp
+++ b/src/cmd-action/cmd-pet.cpp
@@ -153,7 +153,7 @@ void do_cmd_pet_dismiss(PlayerType *player_ptr)
         if ((all_pets && !should_ask) || (!all_pets && delete_this)) {
             if (record_named_pet && m_ptr->is_named()) {
                 const auto m_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-                exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);
+                exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);
             }
 
             if (pet_ctr == player_ptr->riding) {
@@ -366,11 +366,11 @@ static void do_name_pet(PlayerType *player_ptr)
                 /* Save the inscription */
                 m_ptr->nickname = out_val;
                 if (record_named_pet) {
-                    exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_NAME, monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE));
+                    exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_NAME, monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE));
                 }
             } else {
                 if (record_named_pet && old_name) {
-                    exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_UNNAME, monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE));
+                    exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_UNNAME, monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE));
                 }
                 m_ptr->nickname.clear();
             }

diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index eb2af8e..135795d 100644 (file)
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -698,7 +698,7 @@ static void change_realm2(PlayerType *player_ptr, int16_t next_realm)
 
     constexpr auto fmt_realm = _("魔法の領域を%sから%sに変更した。", "changed magic realm from %s to %s.");
     const auto mes = format(fmt_realm, realm_names[player_ptr->realm2], realm_names[next_realm]);
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, mes);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, mes);
     player_ptr->old_realm |= 1U << (player_ptr->realm2 - 1);
     player_ptr->realm2 = next_realm;
 

diff --git a/src/cmd-building/cmd-inn.cpp b/src/cmd-building/cmd-inn.cpp
index ad87bf2..53ca8cd 100644 (file)
--- a/src/cmd-building/cmd-inn.cpp
+++ b/src/cmd-building/cmd-inn.cpp
@@ -71,12 +71,12 @@ static void write_diary_stay_inn(PlayerType *player_ptr, int prev_hour)
 {
     if ((prev_hour >= 6) && (prev_hour < 18)) {
         const auto stay_message = _(is_player_undead(player_ptr) ? "宿屋に泊まった。" : "日が暮れるまで宿屋で過ごした。", "stayed during the day at the inn.");
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, stay_message);
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, stay_message);
         return;
     }
 
     const auto stay_message = _(is_player_undead(player_ptr) ? "夜が明けるまで宿屋で過ごした。" : "宿屋に泊まった。", "stayed overnight at the inn.");
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, stay_message);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, stay_message);
 }
 
 /*!
@@ -119,7 +119,7 @@ static bool has_a_nightmare(PlayerType *player_ptr)
     }
 
     msg_print(_("あなたは絶叫して目を覚ました。", "You awake screaming."));
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("悪夢にうなされてよく眠れなかった。", "had a nightmare."));
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, _("悪夢にうなされてよく眠れなかった。", "had a nightmare."));
     return true;
 }
 
@@ -172,13 +172,13 @@ static void display_stay_result(PlayerType *player_ptr, int prev_hour)
         msg_format("You awake refreshed for the %s.", is_player_undead(player_ptr) ? "evening" : "twilight");
 #endif
         const auto awake_message = _(is_player_undead(player_ptr) ? "すがすがしい夜を迎えた。" : "夕方を迎えた。", "awoke refreshed.");
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, awake_message);
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, awake_message);
         return;
     }
 
     msg_print(_("あなたはリフレッシュして目覚め、新たな日を迎えた。", "You awake refreshed for the new day."));
     const auto awake_message = _(is_player_undead(player_ptr) ? "すがすがしい朝を迎えた。" : "朝を迎えた。", "awoke refreshed.");
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, awake_message);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, awake_message);
 }
 
 /*!
@@ -201,7 +201,7 @@ static bool stay_inn(PlayerType *player_ptr)
 
     if ((prev_hour >= 18) && (prev_hour <= 23)) {
         determine_daily_bounty(player_ptr, false); /* Update daily bounty */
-        exe_write_diary(player_ptr, DIARY_DIALY, 0);
+        exe_write_diary(player_ptr, DiaryKind::DIALY, 0);
     }
 
     player_ptr->chp = player_ptr->mhp;

diff --git a/src/cmd-io/cmd-diary.cpp b/src/cmd-io/cmd-diary.cpp
index acc635c..a840846 100644 (file)
--- a/src/cmd-io/cmd-diary.cpp
+++ b/src/cmd-io/cmd-diary.cpp
@@ -49,7 +49,7 @@ static void add_diary_note(PlayerType *player_ptr)
 {
     char tmp[80]{};
     if (get_string(_("内容: ", "diary note: "), tmp, 79)) {
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, tmp);
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, tmp);
     }
 }
 
@@ -70,7 +70,7 @@ static void do_cmd_last_get(PlayerType *player_ptr)
     GAME_TURN turn_tmp = w_ptr->game_turn;
     w_ptr->game_turn = record_turn;
     const auto mes = format(_("%sを手に入れた。", "discover %s."), record_o_name);
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, mes);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, mes);
     w_ptr->game_turn = turn_tmp;
 }
 

diff --git a/src/cmd-io/cmd-gameoption.cpp b/src/cmd-io/cmd-gameoption.cpp
index 99a27c7..c20cfe9 100644 (file)
--- a/src/cmd-io/cmd-gameoption.cpp
+++ b/src/cmd-io/cmd-gameoption.cpp
@@ -379,7 +379,7 @@ static void do_cmd_options_cheat(PlayerType *player_ptr, concptr info)
         case 'Y':
         case '6':
             if (!w_ptr->noscore) {
-                exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0,
+                exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0,
                     _("詐欺オプションをONにして、スコアを残せなくなった。", "gave up sending score to use cheating options."));
             }
 

diff --git a/src/cmd-io/cmd-save.cpp b/src/cmd-io/cmd-save.cpp
index 7b7a8d8..67653e7 100644 (file)
--- a/src/cmd-io/cmd-save.cpp
+++ b/src/cmd-io/cmd-save.cpp
@@ -52,5 +52,5 @@ void do_cmd_save_and_exit(PlayerType *player_ptr)
 {
     player_ptr->playing = false;
     player_ptr->leaving = true;
-    exe_write_diary(player_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "--- Saved and Exited Game ---"));
+    exe_write_diary(player_ptr, DiaryKind::GAMESTART, 0, _("----ゲーム中断----", "--- Saved and Exited Game ---"));
 }

diff --git a/src/core/game-closer.cpp b/src/core/game-closer.cpp
index 82ffef8..cb4c40d 100644 (file)
--- a/src/core/game-closer.cpp
+++ b/src/core/game-closer.cpp
@@ -124,9 +124,9 @@ static void kingly(PlayerType *player_ptr)
 #endif
 
     if (!seppuku) {
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("ダンジョンの探索から引退した。", "retired exploring dungeons."));
-        exe_write_diary(player_ptr, DIARY_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n");
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, _("ダンジョンの探索から引退した。", "retired exploring dungeons."));
+        exe_write_diary(player_ptr, DiaryKind::GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, "\n\n\n\n");
     }
 
     flush();

diff --git a/src/core/game-play.cpp b/src/core/game-play.cpp
index 3924ad7..84d5e32 100644 (file)
--- a/src/core/game-play.cpp
+++ b/src/core/game-play.cpp
@@ -209,7 +209,7 @@ static void restore_world_floor_info(PlayerType *player_ptr)
 {
     write_level = false;
     constexpr auto mes = _("                            ----ゲーム再開----", "                            --- Restarted Game ---");
-    exe_write_diary(player_ptr, DIARY_GAMESTART, 1, mes);
+    exe_write_diary(player_ptr, DiaryKind::GAMESTART, 1, mes);
 
     if (player_ptr->riding == -1) {
         player_ptr->riding = 0;
@@ -291,7 +291,7 @@ static void generate_world(PlayerType *player_ptr, bool new_game)
     }
 
     const auto mes = format(_("%sに降り立った。", "arrived in %s."), map_name(player_ptr).data());
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, mes);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, mes);
 }
 
 static void init_io(PlayerType *player_ptr)

diff --git a/src/dungeon/dungeon-processor.cpp b/src/dungeon/dungeon-processor.cpp
index 84b3335..209caaa 100644 (file)
--- a/src/dungeon/dungeon-processor.cpp
+++ b/src/dungeon/dungeon-processor.cpp
@@ -130,7 +130,7 @@ void process_dungeon(PlayerType *player_ptr, bool load_game)
     if ((max_dlv[floor.dungeon_idx] < floor.dun_level) && !inside_quest(floor.quest_number)) {
         max_dlv[floor.dungeon_idx] = floor.dun_level;
         if (record_maxdepth) {
-            exe_write_diary(player_ptr, DIARY_MAXDEAPTH, floor.dun_level);
+            exe_write_diary(player_ptr, DiaryKind::MAXDEAPTH, floor.dun_level);
         }
     }
 

diff --git a/src/dungeon/quest.cpp b/src/dungeon/quest.cpp
index bf2ad7b..d661199 100644 (file)
--- a/src/dungeon/quest.cpp
+++ b/src/dungeon/quest.cpp
@@ -257,12 +257,12 @@ void complete_quest(PlayerType *player_ptr, QuestId quest_num)
     switch (q_ptr->type) {
     case QuestKindType::RANDOM:
         if (record_rand_quest) {
-            exe_write_diary_quest(player_ptr, DIARY_RAND_QUEST_C, quest_num);
+            exe_write_diary_quest(player_ptr, DiaryKind::RAND_QUEST_C, quest_num);
         }
         break;
     default:
         if (record_fix_quest) {
-            exe_write_diary_quest(player_ptr, DIARY_FIX_QUEST_C, quest_num);
+            exe_write_diary_quest(player_ptr, DiaryKind::FIX_QUEST_C, quest_num);
         }
         break;
     }
@@ -437,13 +437,13 @@ void leave_quest_check(PlayerType *player_ptr)
     /* Record finishing a quest */
     if (q_ptr->type == QuestKindType::RANDOM) {
         if (record_rand_quest) {
-            exe_write_diary_quest(player_ptr, DIARY_RAND_QUEST_F, leaving_quest);
+            exe_write_diary_quest(player_ptr, DiaryKind::RAND_QUEST_F, leaving_quest);
         }
         return;
     }
 
     if (record_fix_quest) {
-        exe_write_diary_quest(player_ptr, DIARY_FIX_QUEST_F, leaving_quest);
+        exe_write_diary_quest(player_ptr, DiaryKind::FIX_QUEST_F, leaving_quest);
     }
 }
 

diff --git a/src/effect/effect-monster.cpp b/src/effect/effect-monster.cpp
index 3de4b68..20f6715 100644 (file)
--- a/src/effect/effect-monster.cpp
+++ b/src/effect/effect-monster.cpp
@@ -277,7 +277,7 @@ static bool heal_leaper(PlayerType *player_ptr, effect_monster_type *em_ptr)
 
     if (record_named_pet && em_ptr->m_ptr->is_named_pet()) {
         const auto m2_name = monster_desc(player_ptr, em_ptr->m_ptr, MD_INDEF_VISIBLE);
-        exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
+        exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
     }
 
     delete_monster_idx(player_ptr, em_ptr->g_ptr->m_idx);

diff --git a/src/floor/floor-changer.cpp b/src/floor/floor-changer.cpp
index 3e1448c..ce4b1ad 100644 (file)
--- a/src/floor/floor-changer.cpp
+++ b/src/floor/floor-changer.cpp
@@ -153,7 +153,7 @@ static void place_pet(PlayerType *player_ptr)
             auto &r_ref = m_ptr->get_real_r_ref();
             msg_format(_("%sとはぐれてしまった。", "You have lost sight of %s."), monster_desc(player_ptr, m_ptr, 0).data());
             if (record_named_pet && m_ptr->is_named()) {
-                exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE));
+                exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_LOST_SIGHT, monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE));
             }
 
             if (r_ref.cur_num) {

diff --git a/src/floor/floor-generator.cpp b/src/floor/floor-generator.cpp
index 2798a9d..2b7282a 100644 (file)
--- a/src/floor/floor-generator.cpp
+++ b/src/floor/floor-generator.cpp
@@ -272,7 +272,7 @@ static void generate_fixed_floor(PlayerType *player_ptr)
     floor_ptr->object_level = floor_ptr->base_level;
     floor_ptr->monster_level = floor_ptr->base_level;
     if (record_stair) {
-        exe_write_diary_quest(player_ptr, DIARY_TO_QUEST, floor_ptr->quest_number);
+        exe_write_diary_quest(player_ptr, DiaryKind::TO_QUEST, floor_ptr->quest_number);
     }
     get_mon_num_prep(player_ptr, get_monster_hook(player_ptr), nullptr);
     init_flags = INIT_CREATE_DUNGEON;

diff --git a/src/floor/floor-leaver.cpp b/src/floor/floor-leaver.cpp
index 0f9b51d..7280ffa 100644 (file)
--- a/src/floor/floor-leaver.cpp
+++ b/src/floor/floor-leaver.cpp
@@ -103,7 +103,7 @@ static void record_pet_diary(PlayerType *player_ptr)
             continue;
         }
 
-        exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_MOVED, monster_desc(player_ptr, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE));
+        exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_MOVED, monster_desc(player_ptr, m_ptr, MD_ASSUME_VISIBLE | MD_INDEF_VISIBLE));
     }
 }
 

diff --git a/src/floor/pattern-walk.cpp b/src/floor/pattern-walk.cpp
index 1cf3a29..2b1d59e 100644 (file)
--- a/src/floor/pattern-walk.cpp
+++ b/src/floor/pattern-walk.cpp
@@ -94,7 +94,7 @@ void pattern_teleport(PlayerType *player_ptr)
     player_ptr->current_floor_ptr->dun_level = command_arg;
     leave_quest_check(player_ptr);
     if (record_stair) {
-        exe_write_diary(player_ptr, DIARY_PAT_TELE, 0);
+        exe_write_diary(player_ptr, DiaryKind::PAT_TELE, 0);
     }
 
     player_ptr->current_floor_ptr->quest_number = QuestId::NONE;

diff --git a/src/grid/trap.cpp b/src/grid/trap.cpp
index bcf413f..1b91be4 100644 (file)
--- a/src/grid/trap.cpp
+++ b/src/grid/trap.cpp
@@ -434,7 +434,7 @@ void hit_trap(PlayerType *player_ptr, bool break_trap)
                 do_cmd_save_game(player_ptr, true);
             }
 
-            exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("落とし戸に落ちた", "fell through a trap door!"));
+            exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, _("落とし戸に落ちた", "fell through a trap door!"));
             prepare_change_floor_mode(player_ptr, CFM_SAVE_FLOORS | CFM_DOWN | CFM_RAND_PLACE | CFM_RAND_CONNECT);
             player_ptr->leaving = true;
         }

diff --git a/src/io/input-key-processor.cpp b/src/io/input-key-processor.cpp
index 5a20b04..b725234 100644 (file)
--- a/src/io/input-key-processor.cpp
+++ b/src/io/input-key-processor.cpp
@@ -119,7 +119,7 @@ bool enter_wizard_mode(PlayerType *player_ptr)
         }
 
         constexpr auto mes = _("ウィザードモードに突入してスコアを残せなくなった。", "gave up recording score to enter wizard mode.");
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, mes);
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, mes);
         w_ptr->noscore |= 0x0002;
     }
 
@@ -148,7 +148,7 @@ static bool enter_debug_mode(PlayerType *player_ptr)
         }
 
         constexpr auto mes = _("デバッグモードに突入してスコアを残せなくなった。", "gave up sending score to use debug commands.");
-        exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, mes);
+        exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, mes);
         w_ptr->noscore |= 0x0008;
     }
 

diff --git a/src/io/signal-handlers.cpp b/src/io/signal-handlers.cpp
index fe188e1..2581019 100644 (file)
--- a/src/io/signal-handlers.cpp
+++ b/src/io/signal-handlers.cpp
@@ -135,7 +135,7 @@ static void handle_signal_abort(int sig)
 
     term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ...", "Panic save..."));
 
-    exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム異常終了----", "-- Tried Panic Save and Aborted Game --"));
+    exe_write_diary(p_ptr, DiaryKind::GAMESTART, 0, _("----ゲーム異常終了----", "-- Tried Panic Save and Aborted Game --"));
     term_fresh();
 
     p_ptr->panic_save = 1;

diff --git a/src/io/write-diary.cpp b/src/io/write-diary.cpp
index 69c9b2e..7fa81c9 100644 (file)
--- a/src/io/write-diary.cpp
+++ b/src/io/write-diary.cpp
@@ -161,14 +161,13 @@ static void write_diary_pet(FILE *fff, int num, std::string_view note)
     }
 }
 
-/**
+/*!
  * @brief 日記にクエストに関するメッセージを追加する
- *
- * @param type 日記内容のID
+ * @param dk 日記内容のID
  * @param num 日記内容のIDに応じた番号
  * @return エラーコード
  */
-int exe_write_diary_quest(PlayerType *player_ptr, int type, QuestId num)
+int exe_write_diary_quest(PlayerType *player_ptr, DiaryKind dk, QuestId num)
 {
     static bool disable_diary = false;
 
@@ -197,8 +196,8 @@ int exe_write_diary_quest(PlayerType *player_ptr, int type, QuestId num)
 
     bool do_level = true;
 
-    switch (type) {
-    case DIARY_FIX_QUEST_C: {
+    switch (dk) {
+    case DiaryKind::FIX_QUEST_C: {
         if (any_bits(quest.flags, QUEST_FLAG_SILENT)) {
             break;
         }
@@ -207,7 +206,7 @@ int exe_write_diary_quest(PlayerType *player_ptr, int type, QuestId num)
         fprintf(fff, mes, hour, min, note_level.data(), quest.name.data());
         break;
     }
-    case DIARY_FIX_QUEST_F: {
+    case DiaryKind::FIX_QUEST_F: {
         if (any_bits(quest.flags, QUEST_FLAG_SILENT)) {
             break;
         }
@@ -216,17 +215,17 @@ int exe_write_diary_quest(PlayerType *player_ptr, int type, QuestId num)
         fprintf(fff, mes, hour, min, note_level.data(), quest.name.data());
         break;
     }
-    case DIARY_RAND_QUEST_C: {
+    case DiaryKind::RAND_QUEST_C: {
         constexpr auto mes = _(" %2d:%02d %20s ランダムクエスト(%s)を達成した。\n", " %2d:%02d %20s completed random quest '%s'\n");
         fprintf(fff, mes, hour, min, note_level.data(), monraces_info[quest.r_idx].name.data());
         break;
     }
-    case DIARY_RAND_QUEST_F: {
+    case DiaryKind::RAND_QUEST_F: {
         constexpr auto mes = _(" %2d:%02d %20s ランダムクエスト(%s)から逃げ出した。\n", " %2d:%02d %20s ran away from quest '%s'.\n");
         fprintf(fff, mes, hour, min, note_level.data(), monraces_info[quest.r_idx].name.data());
         break;
     }
-    case DIARY_TO_QUEST: {
+    case DiaryKind::TO_QUEST: {
         if (any_bits(quest.flags, QUEST_FLAG_SILENT)) {
             break;
         }
@@ -248,13 +247,12 @@ int exe_write_diary_quest(PlayerType *player_ptr, int type, QuestId num)
 }
 
 /*!
- * @brief 日記にメッセージを追加する /
- * Take note to the diary.
- * @param type 日記内容のID
+ * @brief 日記にメッセージを追加する
+ * @param dk 日記内容のID
  * @param num 日記内容のIDに応じた数値
- * @param note 日記内容のIDに応じた文字列参照ポインタ
+ * @param note 日記内容のIDに応じた文字列
  */
-void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view note)
+void exe_write_diary(PlayerType *player_ptr, DiaryKind dk, int num, std::string_view note)
 {
     static bool disable_diary = false;
 
@@ -273,8 +271,8 @@ void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view
     const auto &floor = *player_ptr->current_floor_ptr;
     const auto [q_idx, note_level] = write_floor(floor);
     auto do_level = true;
-    switch (type) {
-    case DIARY_DIALY:
+    switch (dk) {
+    case DiaryKind::DIALY:
         if (day < MAX_DAYS) {
             fprintf(fff, _("%d日目\n", "Day %d\n"), day);
         } else {
@@ -283,7 +281,7 @@ void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view
 
         do_level = false;
         break;
-    case DIARY_DESCRIPTION:
+    case DiaryKind::DESCRIPTION:
         if (num) {
             fprintf(fff, "%s\n", note.data());
             do_level = false;
@@ -292,34 +290,34 @@ void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view
         }
 
         break;
-    case DIARY_ART: {
+    case DiaryKind::ART: {
         constexpr auto mes = _(" %2d:%02d %20s %sを発見した。\n", " %2d:%02d %20s discovered %s.\n");
         fprintf(fff, mes, hour, min, note_level.data(), note.data());
         break;
     }
-    case DIARY_ART_SCROLL: {
+    case DiaryKind::ART_SCROLL: {
         constexpr auto mes = _(" %2d:%02d %20s 巻物によって%sを生成した。\n", " %2d:%02d %20s created %s by scroll.\n");
         fprintf(fff, mes, hour, min, note_level.data(), note.data());
         break;
     }
-    case DIARY_UNIQUE: {
+    case DiaryKind::UNIQUE: {
         constexpr auto mes = _(" %2d:%02d %20s %sを倒した。\n", " %2d:%02d %20s defeated %s.\n");
         fprintf(fff, mes, hour, min, note_level.data(), note.data());
         break;
     }
-    case DIARY_MAXDEAPTH: {
+    case DiaryKind::MAXDEAPTH: {
         constexpr auto mes = _(" %2d:%02d %20s %sの最深階%d階に到達した。\n", " %2d:%02d %20s reached level %d of %s for the first time.\n");
         const auto &dungeon = dungeons_info[floor.dungeon_idx];
         fprintf(fff, mes, hour, min, note_level.data(), _(dungeon.name.data(), num), _(num, dungeon.name.data()));
         break;
     }
-    case DIARY_TRUMP: {
+    case DiaryKind::TRUMP: {
         constexpr auto mes = _(" %2d:%02d %20s %s%sの最深階を%d階にセットした。\n", " %2d:%02d %20s reset recall level of %s to %d %s.\n");
         const auto &dungeon = dungeons_info[floor.dungeon_idx];
         fprintf(fff, mes, hour, min, note_level.data(), note.data(), _(dungeon.name.data(), (int)max_dlv[num]), _((int)max_dlv[num], dungeon.name.data()));
         break;
     }
-    case DIARY_STAIR: {
+    case DiaryKind::STAIR: {
         auto to = inside_quest(q_idx) && (QuestType::is_fixed(q_idx) && !((q_idx == QuestId::OBERON) || (q_idx == QuestId::SERPENT)))
                       ? _("地上", "the surface")
                   : !(player_ptr->current_floor_ptr->dun_level + num)
@@ -329,7 +327,7 @@ void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view
         fprintf(fff, mes, hour, min, note_level.data(), _(to.data(), note.data()), _(note.data(), to.data()));
         break;
     }
-    case DIARY_RECALL:
+    case DiaryKind::RECALL:
         if (!num) {
             constexpr auto mes = _(" %2d:%02d %20s 帰還を使って%sの%d階へ下りた。\n", " %2d:%02d %20s recalled to dungeon level %d of %s.\n");
             const auto &dungeon = dungeons_info[floor.dungeon_idx];
@@ -340,22 +338,22 @@ void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view
         }
 
         break;
-    case DIARY_TELEPORT_LEVEL: {
+    case DiaryKind::TELEPORT_LEVEL: {
         constexpr auto mes = _(" %2d:%02d %20s レベル・テレポートで脱出した。\n", " %2d:%02d %20s got out using teleport level.\n");
         fprintf(fff, mes, hour, min, note_level.data());
         break;
     }
-    case DIARY_BUY: {
+    case DiaryKind::BUY: {
         constexpr auto mes = _(" %2d:%02d %20s %sを購入した。\n", " %2d:%02d %20s bought %s.\n");
         fprintf(fff, mes, hour, min, note_level.data(), note.data());
         break;
     }
-    case DIARY_SELL: {
+    case DiaryKind::SELL: {
         constexpr auto mes = _(" %2d:%02d %20s %sを売却した。\n", " %2d:%02d %20s sold %s.\n");
         fprintf(fff, mes, hour, min, note_level.data(), note.data());
         break;
     }
-    case DIARY_ARENA: {
+    case DiaryKind::ARENA: {
         if (num < 0) {
             int n = -num;
             constexpr auto mes = _(" %2d:%02d %20s 闘技場の%d%s回戦で、%sの前に敗れ去った。\n", " %2d:%02d %20s beaten by %s in the %d%s fight.\n");
@@ -375,25 +373,26 @@ void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view
 
         break;
     }
-    case DIARY_FOUND: {
+    case DiaryKind::FOUND: {
         constexpr auto mes = _(" %2d:%02d %20s %sを識別した。\n", " %2d:%02d %20s identified %s.\n");
         fprintf(fff, mes, hour, min, note_level.data(), note.data());
         break;
     }
-    case DIARY_PAT_TELE: {
-        auto to = !floor.is_in_dungeon()
+    case DiaryKind::PAT_TELE: {
+        const auto &floor_ref = *player_ptr->current_floor_ptr;
+        auto to = !floor_ref.is_in_dungeon()
                       ? _("地上", "the surface")
                       : format(_("%d階(%s)", "level %d of %s"), floor.dun_level, dungeons_info[floor.dungeon_idx].name.data());
         constexpr auto mes = _(" %2d:%02d %20s %sへとパターンの力で移動した。\n", " %2d:%02d %20s used Pattern to teleport to %s.\n");
         fprintf(fff, mes, hour, min, note_level.data(), to.data());
         break;
     }
-    case DIARY_LEVELUP: {
+    case DiaryKind::LEVELUP: {
         constexpr auto mes = _(" %2d:%02d %20s レベルが%dに上がった。\n", " %2d:%02d %20s reached player level %d.\n");
         fprintf(fff, mes, hour, min, note_level.data(), num);
         break;
     }
-    case DIARY_GAMESTART: {
+    case DiaryKind::GAMESTART: {
         time_t ct = time((time_t *)0);
         do_level = false;
         if (num) {
@@ -404,11 +403,11 @@ void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view
 
         break;
     }
-    case DIARY_NAMED_PET:
+    case DiaryKind::NAMED_PET:
         fprintf(fff, " %2d:%02d %20s ", hour, min, note_level.data());
         write_diary_pet(fff, num, note.data());
         break;
-    case DIARY_WIZARD_LOG:
+    case DiaryKind::WIZARD_LOG:
         fprintf(fff, "%s\n", note.data());
         break;
     default:

diff --git a/src/io/write-diary.h b/src/io/write-diary.h
index 1c6a6f0..f385b78 100644 (file)
--- a/src/io/write-diary.h
+++ b/src/io/write-diary.h
@@ -6,31 +6,32 @@
 #include <string>
 #endif
 
-#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
-// 20は欠番.
-#define DIARY_NAMED_PET 21
-#define DIARY_PAT_TELE 22
-#define DIARY_ART_SCROLL 23
-#define DIARY_WIZARD_LOG 24
+enum class DiaryKind {
+    DIALY,
+    DESCRIPTION,
+    ART,
+    UNIQUE,
+    FIX_QUEST_C,
+    FIX_QUEST_F,
+    RAND_QUEST_C,
+    RAND_QUEST_F,
+    MAXDEAPTH,
+    TRUMP,
+    STAIR,
+    RECALL,
+    TO_QUEST,
+    TELEPORT_LEVEL,
+    BUY,
+    SELL,
+    ARENA,
+    FOUND,
+    LEVELUP,
+    GAMESTART,
+    NAMED_PET,
+    PAT_TELE,
+    ART_SCROLL,
+    WIZARD_LOG,
+};
 
 #define RECORD_NAMED_PET_NAME 0
 #define RECORD_NAMED_PET_UNNAME 1
@@ -56,5 +57,5 @@ enum class QuestId : short;
 #else
 std::string get_ordinal_number_suffix(int num);
 #endif
-int exe_write_diary_quest(PlayerType *player_ptr, int type, QuestId num);
-void exe_write_diary(PlayerType *player_ptr, int type, int num, std::string_view note = "");
+int exe_write_diary_quest(PlayerType *player_ptr, DiaryKind dk, QuestId num);
+void exe_write_diary(PlayerType *player_ptr, DiaryKind dk, int num, std::string_view note = "");

diff --git a/src/main-win.cpp b/src/main-win.cpp
index d4c4ccf..20288f3 100644 (file)
--- a/src/main-win.cpp
+++ b/src/main-win.cpp
@@ -2443,7 +2443,7 @@ LRESULT PASCAL angband_window_procedure(HWND hWnd, UINT uMsg, WPARAM wParam, LPA
         if (p_ptr->chp < 0) {
             p_ptr->is_dead = false;
         }
-        exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
+        exe_write_diary(p_ptr, DiaryKind::GAMESTART, 0, _("----ゲーム中断----", "---- Save and Exit Game ----"));
 
         p_ptr->panic_save = 1;
         signals_ignore_tstp();

diff --git a/src/monster-floor/monster-death.cpp b/src/monster-floor/monster-death.cpp
index cf98c87..0b75903 100644 (file)
--- a/src/monster-floor/monster-death.cpp
+++ b/src/monster-floor/monster-death.cpp
@@ -58,7 +58,7 @@ static void write_pet_death(PlayerType *player_ptr, monster_death_type *md_ptr)
     md_ptr->md_x = md_ptr->m_ptr->fx;
     if (record_named_pet && md_ptr->m_ptr->is_named_pet()) {
         const auto m_name = monster_desc(player_ptr, md_ptr->m_ptr, MD_INDEF_VISIBLE);
-        exe_write_diary(player_ptr, DIARY_NAMED_PET, 3, m_name);
+        exe_write_diary(player_ptr, DiaryKind::NAMED_PET, 3, m_name);
     }
 }
 
@@ -113,7 +113,7 @@ static void on_defeat_arena_monster(PlayerType *player_ptr, monster_death_type *
     }
 
     const auto m_name = monster_desc(player_ptr, md_ptr->m_ptr, MD_WRONGDOER_NAME);
-    exe_write_diary(player_ptr, DIARY_ARENA, player_ptr->arena_number, m_name);
+    exe_write_diary(player_ptr, DiaryKind::ARENA, player_ptr->arena_number, m_name);
 }
 
 static void drop_corpse(PlayerType *player_ptr, monster_death_type *md_ptr)
@@ -334,7 +334,7 @@ static void on_defeat_last_boss(PlayerType *player_ptr)
     add_winner_class(player_ptr->pclass);
     RedrawingFlagsUpdater::get_instance().set_flag(MainWindowRedrawingFlag::TITLE);
     play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR);
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("見事に変愚蛮怒の勝利者となった！", "finally became *WINNER* of Hengband!"));
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, _("見事に変愚蛮怒の勝利者となった！", "finally became *WINNER* of Hengband!"));
     patron_list[player_ptr->chaos_patron].admire(player_ptr);
     msg_print(_("*** おめでとう ***", "*** CONGRATULATIONS ***"));
     msg_print(_("あなたはゲームをコンプリートしました。", "You have won the game!"));

diff --git a/src/monster/monster-compaction.cpp b/src/monster/monster-compaction.cpp
index f8a46b1..e7d521c 100644 (file)
--- a/src/monster/monster-compaction.cpp
+++ b/src/monster/monster-compaction.cpp
@@ -142,7 +142,7 @@ void compact_monsters(PlayerType *player_ptr, int size)
 
             if (record_named_pet && m_ptr->is_named_pet()) {
                 const auto m_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-                exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
+                exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
             }
 
             delete_monster_idx(player_ptr, i);

diff --git a/src/monster/monster-damage.cpp b/src/monster/monster-damage.cpp
index a77f627..2172b2a 100644 (file)
--- a/src/monster/monster-damage.cpp
+++ b/src/monster/monster-damage.cpp
@@ -158,7 +158,7 @@ bool MonsterDamageProcessor::process_dead_exp_virtue(std::string_view note, Mons
     if (r_ref.kind_flags.has(MonsterKindType::UNIQUE) && record_destroy_uniq) {
         std::stringstream ss;
         ss << r_ref.name << (m_ptr->mflag2.has(MonsterConstantFlagType::CLONED) ? _("(クローン)", "(Clone)") : "");
-        exe_write_diary(this->player_ptr, DIARY_UNIQUE, 0, ss.str());
+        exe_write_diary(this->player_ptr, DiaryKind::UNIQUE, 0, ss.str());
     }
 
     sound(SOUND_KILL);

diff --git a/src/monster/monster-processor.cpp b/src/monster/monster-processor.cpp
index 12edc5f..630e9c5 100644 (file)
--- a/src/monster/monster-processor.cpp
+++ b/src/monster/monster-processor.cpp
@@ -292,7 +292,7 @@ bool vanish_summoned_children(PlayerType *player_ptr, MONSTER_IDX m_idx, bool se
 
     if (record_named_pet && m_ptr->is_named_pet()) {
         const auto m_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-        exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_LOSE_PARENT, m_name);
+        exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_LOSE_PARENT, m_name);
     }
 
     delete_monster_idx(player_ptr, m_idx);

diff --git a/src/perception/object-perception.cpp b/src/perception/object-perception.cpp
index 7405d8f..0b8b6f2 100644 (file)
--- a/src/perception/object-perception.cpp
+++ b/src/perception/object-perception.cpp
@@ -73,7 +73,7 @@ void object_aware(PlayerType *player_ptr, const ItemEntity *o_ptr)
     q_ptr->copy_from(o_ptr);
     q_ptr->number = 1;
     const auto item_name = describe_flavor(player_ptr, q_ptr, OD_NAME_ONLY);
-    exe_write_diary(player_ptr, DIARY_FOUND, 0, item_name);
+    exe_write_diary(player_ptr, DiaryKind::FOUND, 0, item_name);
 }
 
 /*!

diff --git a/src/player/patron.cpp b/src/player/patron.cpp
index 2ab3640..95dcc9f 100644 (file)
--- a/src/player/patron.cpp
+++ b/src/player/patron.cpp
@@ -517,7 +517,7 @@ void Patron::gain_level_reward(PlayerType *player_ptr_, int chosen_reward)
 
     if (!reward.empty()) {
         const auto note = format(_("パトロンの報酬で%s", "The patron rewarded you with %s."), reward.data());
-        exe_write_diary(this->player_ptr, DIARY_DESCRIPTION, 0, note);
+        exe_write_diary(this->player_ptr, DiaryKind::DESCRIPTION, 0, note);
     }
 }
 

diff --git a/src/player/player-damage.cpp b/src/player/player-damage.cpp
index a1f9ebf..79310c4 100644 (file)
--- a/src/player/player-damage.cpp
+++ b/src/player/player-damage.cpp
@@ -386,7 +386,7 @@ int take_hit(PlayerType *player_ptr, int damage_type, int damage, std::string_vi
             msg_format(_("あなたは%sの前に敗れ去った。", "You are beaten by %s."), m_name.data());
             msg_print(nullptr);
             if (record_arena) {
-                exe_write_diary(player_ptr, DIARY_ARENA, -1 - player_ptr->arena_number, m_name);
+                exe_write_diary(player_ptr, DiaryKind::ARENA, -1 - player_ptr->arena_number, m_name);
             }
         } else {
             const auto q_idx = quest_number(floor, floor.dun_level);
@@ -422,7 +422,7 @@ int take_hit(PlayerType *player_ptr, int damage_type, int damage, std::string_vi
             w_ptr->total_winner = false;
             if (winning_seppuku) {
                 add_retired_class(player_ptr->pclass);
-                exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, _("勝利の後切腹した。", "committed seppuku after the winning."));
+                exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, _("勝利の後切腹した。", "committed seppuku after the winning."));
             } else {
                 std::string place;
 
@@ -441,11 +441,11 @@ int take_hit(PlayerType *player_ptr, int damage_type, int damage, std::string_vi
 #else
                 const auto note = format("killed by %s %s.", player_ptr->died_from.data(), place.data());
 #endif
-                exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, note);
+                exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, note);
             }
 
-            exe_write_diary(player_ptr, DIARY_GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
-            exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n");
+            exe_write_diary(player_ptr, DiaryKind::GAMESTART, 1, _("-------- ゲームオーバー --------", "--------   Game  Over   --------"));
+            exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, "\n\n\n\n");
             flush();
             if (get_check_strict(player_ptr, _("画面を保存しますか？", "Dump the screen? "), CHECK_NO_HISTORY)) {
                 do_cmd_save_screen(player_ptr);
@@ -577,7 +577,7 @@ int take_hit(PlayerType *player_ptr, int damage_type, int damage, std::string_vi
             ss << _(hit_from, "was in a critical situation because of ");
             ss << _("によってピンチに陥った。", hit_from);
             ss << _("", ".");
-            exe_write_diary(player_ptr, DIARY_DESCRIPTION, 0, ss.str());
+            exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 0, ss.str());
         }
 
         if (auto_more) {

diff --git a/src/player/player-status.cpp b/src/player/player-status.cpp
index b0dd6f5..46f290c 100644 (file)
--- a/src/player/player-status.cpp
+++ b/src/player/player-status.cpp
@@ -2946,7 +2946,7 @@ void check_experience(PlayerType *player_ptr)
             }
             level_inc_stat = true;
 
-            exe_write_diary(player_ptr, DIARY_LEVELUP, player_ptr->lev);
+            exe_write_diary(player_ptr, DiaryKind::LEVELUP, player_ptr->lev);
         }
 
         sound(SOUND_LEVEL);

diff --git a/src/spell-kind/earthquake.cpp b/src/spell-kind/earthquake.cpp
index ab64e05..59f320c 100644 (file)
--- a/src/spell-kind/earthquake.cpp
+++ b/src/spell-kind/earthquake.cpp
@@ -263,7 +263,7 @@ bool earthquake(PlayerType *player_ptr, POSITION cy, POSITION cx, POSITION r, MO
                     const auto &m_ref = floor_ptr->m_list[gg_ptr->m_idx];
                     if (record_named_pet && m_ref.is_named_pet()) {
                         const auto m2_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-                        exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_EARTHQUAKE, m2_name);
+                        exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_EARTHQUAKE, m2_name);
                     }
                 }
 

diff --git a/src/spell-kind/spells-enchant.cpp b/src/spell-kind/spells-enchant.cpp
index eca90c3..a7c7513 100644 (file)
--- a/src/spell-kind/spells-enchant.cpp
+++ b/src/spell-kind/spells-enchant.cpp
@@ -98,7 +98,7 @@ bool artifact_scroll(PlayerType *player_ptr)
 
     if (record_rand_art) {
         const auto diary_item_name = describe_flavor(player_ptr, o_ptr, OD_NAME_ONLY);
-        exe_write_diary(player_ptr, DIARY_ART_SCROLL, 0, diary_item_name);
+        exe_write_diary(player_ptr, DiaryKind::ART_SCROLL, 0, diary_item_name);
     }
 
     chg_virtue(player_ptr, Virtue::ENCHANT, 1);

diff --git a/src/spell-kind/spells-floor.cpp b/src/spell-kind/spells-floor.cpp
index e50b383..a24ac85 100644 (file)
--- a/src/spell-kind/spells-floor.cpp
+++ b/src/spell-kind/spells-floor.cpp
@@ -352,7 +352,7 @@ bool destroy_area(PlayerType *player_ptr, POSITION y1, POSITION x1, POSITION r,
                 } else {
                     if (record_named_pet && m_ptr->is_named_pet()) {
                         const auto m_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-                        exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_DESTROY, m_name);
+                        exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_DESTROY, m_name);
                     }
 
                     /* Delete the monster (if any) */

diff --git a/src/spell-kind/spells-genocide.cpp b/src/spell-kind/spells-genocide.cpp
index a42fc70..0773f8b 100644 (file)
--- a/src/spell-kind/spells-genocide.cpp
+++ b/src/spell-kind/spells-genocide.cpp
@@ -73,7 +73,7 @@ bool genocide_aux(PlayerType *player_ptr, MONSTER_IDX m_idx, int power, bool pla
     } else {
         if (record_named_pet && m_ptr->is_named_pet()) {
             const auto m_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-            exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
+            exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_GENOCIDE, m_name);
         }
 
         delete_monster_idx(player_ptr, m_idx);

diff --git a/src/spell-kind/spells-perception.cpp b/src/spell-kind/spells-perception.cpp
index e52ddee..42992b0 100644 (file)
--- a/src/spell-kind/spells-perception.cpp
+++ b/src/spell-kind/spells-perception.cpp
@@ -90,11 +90,11 @@ bool identify_item(PlayerType *player_ptr, ItemEntity *o_ptr)
 
     const auto item_name = describe_flavor(player_ptr, o_ptr, OD_NAME_ONLY);
     if (record_fix_art && !old_known && o_ptr->is_fixed_artifact()) {
-        exe_write_diary(player_ptr, DIARY_ART, 0, item_name);
+        exe_write_diary(player_ptr, DiaryKind::ART, 0, item_name);
     }
 
     if (record_rand_art && !old_known && o_ptr->is_random_artifact()) {
-        exe_write_diary(player_ptr, DIARY_ART, 0, item_name);
+        exe_write_diary(player_ptr, DiaryKind::ART, 0, item_name);
     }
 
     return old_known;

diff --git a/src/spell-kind/spells-pet.cpp b/src/spell-kind/spells-pet.cpp
index a173a1d..3088dd9 100644 (file)
--- a/src/spell-kind/spells-pet.cpp
+++ b/src/spell-kind/spells-pet.cpp
@@ -69,7 +69,7 @@ void discharge_minion(PlayerType *player_ptr)
 
         if (record_named_pet && m_ptr->is_named()) {
             const auto m_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-            exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_BLAST, m_name);
+            exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_BLAST, m_name);
         }
 
         delete_monster_idx(player_ptr, i);

diff --git a/src/spell-kind/spells-world.cpp b/src/spell-kind/spells-world.cpp
index ae3dfbd..98a5e2e 100644 (file)
--- a/src/spell-kind/spells-world.cpp
+++ b/src/spell-kind/spells-world.cpp
@@ -128,7 +128,7 @@ void teleport_level(PlayerType *player_ptr, MONSTER_IDX m_idx)
             }
 
             if (record_stair) {
-                exe_write_diary(player_ptr, DIARY_TELEPORT_LEVEL, 1);
+                exe_write_diary(player_ptr, DiaryKind::TELEPORT_LEVEL, 1);
             }
 
             if (autosave_l) {
@@ -157,7 +157,7 @@ void teleport_level(PlayerType *player_ptr, MONSTER_IDX m_idx)
 
         if (m_idx <= 0) {
             if (record_stair) {
-                exe_write_diary(player_ptr, DIARY_TELEPORT_LEVEL, -1);
+                exe_write_diary(player_ptr, DiaryKind::TELEPORT_LEVEL, -1);
             }
 
             if (autosave_l) {
@@ -183,7 +183,7 @@ void teleport_level(PlayerType *player_ptr, MONSTER_IDX m_idx)
 
         if (m_idx <= 0) {
             if (record_stair) {
-                exe_write_diary(player_ptr, DIARY_TELEPORT_LEVEL, -1);
+                exe_write_diary(player_ptr, DiaryKind::TELEPORT_LEVEL, -1);
             }
 
             if (autosave_l) {
@@ -206,7 +206,7 @@ void teleport_level(PlayerType *player_ptr, MONSTER_IDX m_idx)
 
         if (m_idx <= 0) {
             if (record_stair) {
-                exe_write_diary(player_ptr, DIARY_TELEPORT_LEVEL, 1);
+                exe_write_diary(player_ptr, DiaryKind::TELEPORT_LEVEL, 1);
             }
             if (autosave_l) {
                 do_cmd_save_game(player_ptr, true);
@@ -226,7 +226,7 @@ void teleport_level(PlayerType *player_ptr, MONSTER_IDX m_idx)
     QuestCompletionChecker(player_ptr, m_ptr).complete();
     if (record_named_pet && m_ptr->is_named_pet()) {
         const auto m2_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-        exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_TELE_LEVEL, m2_name);
+        exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_TELE_LEVEL, m2_name);
     }
 
     delete_monster_idx(player_ptr, m_idx);
@@ -466,7 +466,7 @@ bool recall_player(PlayerType *player_ptr, TIME_EFFECT turns)
         if (get_check(_("ここは最深到達階より浅い階です。この階に戻って来ますか？ ", "Reset recall depth? "))) {
             max_dlv[floor.dungeon_idx] = floor.dun_level;
             if (record_maxdepth) {
-                exe_write_diary(player_ptr, DIARY_TRUMP, floor.dungeon_idx, _("帰還のときに", "when recalled from dungeon"));
+                exe_write_diary(player_ptr, DiaryKind::TRUMP, floor.dungeon_idx, _("帰還のときに", "when recalled from dungeon"));
             }
         }
     }
@@ -523,7 +523,7 @@ bool free_level_recall(PlayerType *player_ptr)
     max_dlv[player_ptr->recall_dungeon] = ((amt > dungeon.maxdepth) ? dungeon.maxdepth
                                                                     : ((amt < dungeon.mindepth) ? dungeon.mindepth : amt));
     if (record_maxdepth) {
-        exe_write_diary(player_ptr, DIARY_TRUMP, select_dungeon, _("トランプタワーで", "at Trump Tower"));
+        exe_write_diary(player_ptr, DiaryKind::TRUMP, select_dungeon, _("トランプタワーで", "at Trump Tower"));
     }
 
     msg_print(_("回りの大気が張りつめてきた...", "The air about you becomes charged..."));
@@ -574,7 +574,7 @@ bool reset_recall(PlayerType *player_ptr)
 
     if (record_maxdepth) {
         constexpr auto note = _("フロア・リセットで", "using a scroll of reset recall");
-        exe_write_diary(player_ptr, DIARY_TRUMP, select_dungeon, note);
+        exe_write_diary(player_ptr, DiaryKind::TRUMP, select_dungeon, note);
     }
 #ifdef JP
     msg_format("%sの帰還レベルを %d 階にセット。", dungeons_info[select_dungeon].name.data(), dummy);

diff --git a/src/store/purchase-order.cpp b/src/store/purchase-order.cpp
index 14f816f..d36b87b 100644 (file)
--- a/src/store/purchase-order.cpp
+++ b/src/store/purchase-order.cpp
@@ -291,12 +291,12 @@ void store_purchase(PlayerType *player_ptr, StoreSaleType store_num)
     record_turn = w_ptr->game_turn;
 
     if (record_buy) {
-        exe_write_diary(player_ptr, DIARY_BUY, 0, purchased_item_name);
+        exe_write_diary(player_ptr, DiaryKind::BUY, 0, purchased_item_name);
     }
 
     const auto diary_item_name = describe_flavor(player_ptr, o_ptr, OD_NAME_ONLY);
     if (record_rand_art && o_ptr->is_random_artifact()) {
-        exe_write_diary(player_ptr, DIARY_ART, 0, diary_item_name);
+        exe_write_diary(player_ptr, DiaryKind::ART, 0, diary_item_name);
     }
 
     j_ptr->inscription.reset();

diff --git a/src/store/sell-order.cpp b/src/store/sell-order.cpp
index 420f3d3..3a06597 100644 (file)
--- a/src/store/sell-order.cpp
+++ b/src/store/sell-order.cpp
@@ -170,7 +170,7 @@ void store_sell(PlayerType *player_ptr, StoreSaleType store_num)
             msg_format(_("%sを $%dで売却しました。", "You sold %s for %d gold."), sold_item_name.data(), price);
 
             if (record_sell) {
-                exe_write_diary(player_ptr, DIARY_SELL, 0, sold_item_name);
+                exe_write_diary(player_ptr, DiaryKind::SELL, 0, sold_item_name);
             }
 
             if (!((tval == ItemKindType::FIGURINE) && (value > 0))) {

diff --git a/src/wizard/wizard-messages.cpp b/src/wizard/wizard-messages.cpp
index 873893b..697248b 100644 (file)
--- a/src/wizard/wizard-messages.cpp
+++ b/src/wizard/wizard-messages.cpp
@@ -36,7 +36,7 @@ void msg_print_wizard(PlayerType *player_ptr, int cheat_type, concptr msg)
     const auto mes = ss.str();
     msg_print(mes);
     if (cheat_diary_output) {
-        exe_write_diary(player_ptr, DIARY_WIZARD_LOG, 0, mes);
+        exe_write_diary(player_ptr, DiaryKind::WIZARD_LOG, 0, mes);
     }
 }
 

diff --git a/src/wizard/wizard-special-process.cpp b/src/wizard/wizard-special-process.cpp
index 21329a1..d6bd4c8 100644 (file)
--- a/src/wizard/wizard-special-process.cpp
+++ b/src/wizard/wizard-special-process.cpp
@@ -822,7 +822,7 @@ void wiz_zap_surrounding_monsters(PlayerType *player_ptr)
 
         if (record_named_pet && m_ptr->is_named_pet()) {
             const auto m_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-            exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
+            exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
         }
 
         delete_monster_idx(player_ptr, i);
@@ -843,7 +843,7 @@ void wiz_zap_floor_monsters(PlayerType *player_ptr)
 
         if (record_named_pet && m_ptr->is_named_pet()) {
             const auto m_name = monster_desc(player_ptr, m_ptr, MD_INDEF_VISIBLE);
-            exe_write_diary(player_ptr, DIARY_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
+            exe_write_diary(player_ptr, DiaryKind::NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name);
         }
 
         delete_monster_idx(player_ptr, i);
@@ -900,6 +900,6 @@ void cheat_death(PlayerType *player_ptr)
     player_ptr->wild_mode = false;
     player_ptr->leaving = true;
     constexpr auto note = _("                            しかし、生き返った。", "                            but revived.");
-    exe_write_diary(player_ptr, DIARY_DESCRIPTION, 1, note);
+    exe_write_diary(player_ptr, DiaryKind::DESCRIPTION, 1, note);
     leave_floor(player_ptr);
 }

diff --git a/src/world/world-movement-processor.cpp b/src/world/world-movement-processor.cpp
index 4ab3c0e..60bdbc6 100644 (file)
--- a/src/world/world-movement-processor.cpp
+++ b/src/world/world-movement-processor.cpp
@@ -80,7 +80,7 @@ void execute_recall(PlayerType *player_ptr)
             player_ptr->recall_dungeon = floor_ptr->dungeon_idx;
         }
         if (record_stair) {
-            exe_write_diary(player_ptr, DIARY_RECALL, floor_ptr->dun_level);
+            exe_write_diary(player_ptr, DiaryKind::RECALL, floor_ptr->dun_level);
         }
 
         floor_ptr->dun_level = 0;
@@ -96,7 +96,7 @@ void execute_recall(PlayerType *player_ptr)
     msg_print(_("下に引きずり降ろされる感じがする！", "You feel yourself yanked downwards!"));
     floor_ptr->dungeon_idx = player_ptr->recall_dungeon;
     if (record_stair) {
-        exe_write_diary(player_ptr, DIARY_RECALL, floor_ptr->dun_level);
+        exe_write_diary(player_ptr, DiaryKind::RECALL, floor_ptr->dun_level);
     }
 
     floor_ptr->dun_level = max_dlv[floor_ptr->dungeon_idx];

diff --git a/src/world/world-turn-processor.cpp b/src/world/world-turn-processor.cpp
index 8666950..98abaad 100644 (file)
--- a/src/world/world-turn-processor.cpp
+++ b/src/world/world-turn-processor.cpp
@@ -78,7 +78,7 @@ void WorldTurnProcessor::process_world()
     process_world_monsters();
     if (!this->hour && !this->min) {
         if (this->min != prev_min) {
-            exe_write_diary(this->player_ptr, DIARY_DIALY, 0);
+            exe_write_diary(this->player_ptr, DiaryKind::DIALY, 0);
             determine_daily_bounty(this->player_ptr, false);
         }
     }