From 3ca11937157ce0a7ac1762dad9453d12b281f8cf Mon Sep 17 00:00:00 2001
From: dis- <dis.rogue@gmail.com>
Date: Mon, 15 Feb 2021 00:06:34 +0900
Subject: [PATCH] =?utf8?q?[Feature]=20mon-info.txt=E3=81=AE=E5=87=BA?=
 =?utf8?q?=E5=8A=9B=E6=83=85=E5=A0=B1=E3=82=92=E7=8F=BE=E5=9C=A8=E3=81=AE?=
 =?utf8?q?=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC=E6=83=85=E5=A0=B1?=
 =?utf8?q?=E3=81=AB=E4=BE=9D=E5=AD=98=E3=81=95=E3=81=9B=E3=81=AA=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

デバッグ情報の出力が現在のキャラクターの状態に依存していて不安定であった。
将来的にコマンドラインからコールすることも考慮し、依存関係を排除する。
---
 src/view/display-lore.c           | 8 ++++++--
 src/view/display-lore.h           | 2 +-
 src/wizard/monster-info-spoiler.c | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/view/display-lore.c b/src/view/display-lore.c
index 4cd141435..9709e1c42 100644
--- a/src/view/display-lore.c
+++ b/src/view/display-lore.c
@@ -120,10 +120,14 @@ void display_roff(player_type *player_ptr)
  * @param roff_func 出力処理を行う関数ポインタ
  * @return なし
  */
-void output_monster_spoiler(player_type *player_ptr, MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str))
+void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str))
 {
     hook_c_roff = roff_func;
-    process_monster_lore(player_ptr, r_idx, MONSTER_LORE_DEBUG);
+    player_type dummy;
+
+    dummy.lev = 1;
+    dummy.max_plv = 1;
+    process_monster_lore(&dummy, r_idx, MONSTER_LORE_DEBUG);
 }
 
 static bool display_kill_unique(lore_type *lore_ptr)
diff --git a/src/view/display-lore.h b/src/view/display-lore.h
index f950dfe02..6824d01b5 100644
--- a/src/view/display-lore.h
+++ b/src/view/display-lore.h
@@ -6,7 +6,7 @@
 void roff_top(MONRACE_IDX r_idx);
 void screen_roff(player_type *player_ptr, MONRACE_IDX r_idx, monster_lore_mode mode);
 void display_roff(player_type *player_ptr);
-void output_monster_spoiler(player_type *player_ptr, MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str));
+void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str));
 void display_kill_numbers(lore_type *lore_ptr);
 bool display_where_to_appear(lore_type *lore_ptr);
 void display_random_move(lore_type *lore_ptr);
diff --git a/src/wizard/monster-info-spoiler.c b/src/wizard/monster-info-spoiler.c
index 9b969d9be..d69b59ece 100644
--- a/src/wizard/monster-info-spoiler.c
+++ b/src/wizard/monster-info-spoiler.c
@@ -237,7 +237,7 @@ void spoil_mon_info(player_type *player_ptr, concptr fname)
         spoil_out(buf);
         sprintf(buf, "Exp:%ld\n", (long)(r_ptr->mexp));
         spoil_out(buf);
-        output_monster_spoiler(player_ptr, who[i], roff_func);
+        output_monster_spoiler(who[i], roff_func);
         spoil_out(NULL);
     }
 
-- 
2.11.0