[Refactor] #37353 バリアント名称とバージョン定義を core.h へ移動．

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

diff --git a/src/object1.c b/src/object1.c
index ae735de..474f996 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "artifact.h"
@@ -25,6 +26,9 @@
 #include "monster.h"
 #include "files.h"
 #include "term.h"
+#include "cmd-smith.h"
+#include "snipe.h"
+#include "view-mainwindow.h"
 
 #if defined(MACINTOSH) || defined(MACH_O_CARBON)
 #ifdef verify
@@ -91,7 +95,7 @@ void reset_visuals(void)
                process_pref_file("graf.prf");
 
                /* Access the "character" pref file */
-               sprintf(buf, "graf-%s.prf", player_base);
+               sprintf(buf, "graf-%s.prf", p_ptr->base_name);
 
                /* Process "graf-<playername>.prf" */
                process_pref_file(buf);
@@ -106,7 +110,7 @@ void reset_visuals(void)
                process_pref_file("font.prf");
 
                /* Access the "character" pref file */
-               sprintf(buf, "font-%s.prf", player_base);
+               sprintf(buf, "font-%s.prf", p_ptr->base_name);
 
                /* Process "font-<playername>.prf" */
                process_pref_file(buf);
@@ -1583,6 +1587,12 @@ bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUBTYPE_VA
  */
 bool(*item_tester_hook)(object_type*);
 
+/*
+ * Here is a "pseudo-hook" used during calls to "get_item()" and
+ * "show_inven()" and "show_equip()", and the choice window routines.
+ */
+OBJECT_TYPE_VALUE item_tester_tval;
+
 /*!
  * @brief アイテムがitem_tester_hookグローバル関数ポインタの条件を満たしているかを返す汎用関数
  * Check an item against the item tester info