[Refactor] #37353 object_attr マクロを object.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index 1a0da17..78d674a 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2357,18 +2357,6 @@
 #define term_screen     (angband_term[0])
 
 /*
- * Return the "attr" for a given item.
- * Use "flavor" if available.
- * Default to user definitions.
- */
-#define object_attr(T) \
-       ((k_info[(T)->k_idx].flavor) ? \
-        (k_info[k_info[(T)->k_idx].flavor].x_attr) : \
-        ((!(T)->k_idx || ((T)->tval != TV_CORPSE) || ((T)->sval != SV_CORPSE) || \
-          (k_info[(T)->k_idx].x_attr != TERM_DARK)) ? \
-         (k_info[(T)->k_idx].x_attr) : (r_info[(T)->pval].x_attr)))
-
-/*
  * Return the "char" for a given item.
  * Use "flavor" if available.
  * Default to user definitions.

diff --git a/src/object.h b/src/object.h
index 70fdab1..9f6a5ac 100644 (file)
--- a/src/object.h
+++ b/src/object.h
@@ -186,3 +186,16 @@ extern s32b flag_cost(object_type *o_ptr, int plusses);
 
 extern bool get_item_floor(COMMAND_CODE *cp, concptr pmt, concptr str, BIT_FLAGS mode);
 extern void py_pickup_floor(bool pickup);
+
+/*
+ * Return the "attr" for a given item.
+ * Use "flavor" if available.
+ * Default to user definitions.
+ */
+#define object_attr(T) \
+       ((k_info[(T)->k_idx].flavor) ? \
+        (k_info[k_info[(T)->k_idx].flavor].x_attr) : \
+        ((!(T)->k_idx || ((T)->tval != TV_CORPSE) || ((T)->sval != SV_CORPSE) || \
+          (k_info[(T)->k_idx].x_attr != TERM_DARK)) ? \
+         (k_info[(T)->k_idx].x_attr) : (r_info[(T)->pval].x_attr)))
+