[Refactor] #37353 所持品，装備品表示処理関数を整理．

diff --git a/src/files.c b/src/files.c
index fc2abe5..519acb5 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -26,6 +26,7 @@
 #include "cmd-magiceat.h"
 #include "cmd-dump.h"
 #include "world.h"
+#include "player-inventory.h"
 #include "player-race.h"
 #include "player-status.h"
 #include "player-move.h"

diff --git a/src/object.h b/src/object.h
index edc6e21..f87e16d 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -412,10 +412,6 @@ extern s16b wield_slot(object_type *o_ptr);
 
 extern bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUBTYPE_VALUE book_sval);
 extern bool item_tester_okay(object_type *o_ptr, OBJECT_TYPE_VALUE tval);
-extern void display_inven(OBJECT_TYPE_VALUE tval);
-extern void display_equip(OBJECT_TYPE_VALUE tval);
-extern COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode, OBJECT_TYPE_VALUE tval);
-extern COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode, OBJECT_TYPE_VALUE tval);
 extern void toggle_inven_equip(void);
 
 /*

diff --git a/src/player-inventory.h b/src/player-inventory.h
index 5c86f4b..ad217a3 100644 (file)
--- a/src/player-inventory.h
+++ b/src/player-inventory.h
@@ -4,4 +4,9 @@ extern bool select_ring_slot;
 
 extern bool is_ring_slot(int i);
 extern bool get_item_okay(OBJECT_IDX i);
-extern concptr describe_use(int i);
\ No newline at end of file
+extern concptr describe_use(int i);
+
+extern void display_inven(OBJECT_TYPE_VALUE tval);
+extern void display_equip(OBJECT_TYPE_VALUE tval);
+extern COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode, OBJECT_TYPE_VALUE tval);
+extern COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode, OBJECT_TYPE_VALUE tval);

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 95b6e49..44f1e2e 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -26,6 +26,7 @@
 #include "player-class.h"
 #include "player-race.h"
 #include "player-effects.h"
+#include "player-inventory.h"
 #include "monster.h"
 #include "view-mainwindow.h"