[Refactor] #37353 object_char マクロを objectkind.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index 084cce5..1ef5e7e 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1338,17 +1338,6 @@
 
 
 /*** Macro Definitions ***/
-
-/*
- * Return the "char" for a given item.
- * Use "flavor" if available.
- * Default to user definitions.
- */
-#define object_char(T) \
-       ((k_info[(T)->k_idx].flavor) ? \
-        (k_info[k_info[(T)->k_idx].flavor].x_char) : \
-        (k_info[(T)->k_idx].x_char))
-
 /*
  * Convert an "attr"/"char" pair into a "pict" (P)
  */

diff --git a/src/objectkind.h b/src/objectkind.h
index fe63167..c09227d 100644 (file)
--- a/src/objectkind.h
+++ b/src/objectkind.h
@@ -9,6 +9,18 @@
  * Only "aware" and "tried" are saved in the savefile
  */
 
+
+ /*
+  * Return the "char" for a given item.
+  * Use "flavor" if available.
+  * Default to user definitions.
+  */
+#define object_char(T) \
+       ((k_info[(T)->k_idx].flavor) ? \
+        (k_info[k_info[(T)->k_idx].flavor].x_char) : \
+        (k_info[(T)->k_idx].x_char))
+
+
 typedef struct object_kind object_kind;
 
 struct object_kind