アイテムの種類判定のコードを整理。

[hengband/hengband.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index eeed379..754a599 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -4102,17 +4102,16 @@
 #define term_screen     (angband_term[0])
 
 
-#ifndef SCRIPT_OBJ_KIND
 /*
  * Determine if a given inventory item is "aware"
  */
-#define object_aware_p(T) \
+#define object_is_aware(T) \
     (k_info[(T)->k_idx].aware)
 
 /*
  * Determine if a given inventory item is "tried"
  */
-#define object_tried_p(T) \
+#define object_is_tried(T) \
     (k_info[(T)->k_idx].tried)
 
 
@@ -4121,7 +4120,7 @@
  * Test One -- Check for special "known" tag
  * Test Two -- Check for "Easy Know" + "Aware"
  */
-#define object_known_p(T) \
+#define object_is_known(T) \
     (((T)->ident & (IDENT_KNOWN)) || \
      (k_info[(T)->k_idx].easy_know && k_info[(T)->k_idx].aware))
 
@@ -4147,80 +4146,29 @@
         (k_info[(T)->k_idx].x_char))
 
 
-#else /* SCRIPT_OBJ_KIND */
-
-
-/*
- * Determine if a given inventory item is "aware"
- */
-#define object_aware_p(T) \
-    ((T)->aware)
-
-/*
- * Determine if a given inventory item is "tried"
- */
-#define object_tried_p(T) \
-    ((T)->tried)
-
-
-/*
- * Determine if a given inventory item is "known"
- * Test One -- Check for special "known" tag
- * Test Two -- Check for "Easy Know" + "Aware"
- */
-#define object_known_p(T) \
-    (((T)->ident & (IDENT_KNOWN)) || \
-     ((T)->easy_know && (T)->aware))
-
-
-/*
- * Return the "attr" for a given item.
- * Use "flavor" if available.
- * Default to user definitions.
- */
-#define object_attr(T) \
-       (((T)->flavor) ? \
-        (misc_to_attr[(T)->flavor]) : \
-        ((T)->x_attr))
-
-/*
- * Return the "char" for a given item.
- * Use "flavor" if available.
- * Default to user definitions.
- */
-#define object_char(T) \
-       (((T)->flavor) ? \
-        (misc_to_char[(T)->flavor]) : \
-        ((T)->x_char))
-
-#endif /* SCRIPT_OBJ_KIND */
-
-
-
-
 /*
  * Artifacts use the "name1" field
  */
-#define artifact_p(T) \
+#define object_is_fixed_artifact(T) \
        ((T)->name1 ? TRUE : FALSE)
 
 /*
  * Ego-Items use the "name2" field
  */
-#define ego_item_p(T) \
+#define object_is_ego(T) \
        ((T)->name2 ? TRUE : FALSE)
 
 
 /*
  * Broken items.
  */
-#define broken_p(T) \
+#define object_is_broken(T) \
        ((T)->ident & (IDENT_BROKEN))
 
 /*
  * Cursed items.
  */
-#define cursed_p(T) \
+#define object_is_cursed(T) \
        ((T)->curse_flags)