Changeset 1462

Timestamp:

07/03/09 21:26:00 (14 months ago)

Author:

takkaria

Message:

Use accessor functions for IDENT_ATTACK and IDENT_DEFENCE. (Eddie Grove)

Location:

trunk/src

Files:

• files.c (modified) (2 diffs)
• object/identify.c (modified) (1 diff)
• object/obj-desc.c (modified) (3 diffs)
• object/obj-info.c (modified) (1 diff)
• object/obj-util.c (modified) (1 diff)
• object/object.h (modified) (1 diff)
• player/calcs.c (modified) (2 diffs)

trunk/src/files.c

@@ -599 +599 @@
         int dam = p_ptr->state.dis_to_d;
 
-        if (object_known_p(o_ptr))
+        if (object_attack_plusses_are_visible(o_ptr))
         {
                 hit += o_ptr->to_h;
@@ -615 +615 @@
         int dam = 0;
 
-        if (object_known_p(o_ptr))
+        if (object_attack_plusses_are_visible(o_ptr))
         {
                 hit += o_ptr->to_h;

trunk/src/object/identify.c

@@ -124 +124 @@
 
         return;
+}
+
+
+bool object_attack_plusses_are_visible(const object_type *o_ptr)
+{
+        /* XXX Eddie next ref to IDENT_STORE not clearly correct -- perhaps should guarantee store items have IDENT_ATTACK set */
+        if (object_known_p(o_ptr) ||
+                        (o_ptr->ident & IDENT_ATTACK) || (o_ptr->ident & IDENT_STORE))
+                return TRUE;
+        else
+                return FALSE;
+}
+
+
+bool object_defence_plusses_are_visible(const object_type *o_ptr)
+{
+        /* XXX Eddie next IDENT_STORE not clear -- perhaps should guarantee store items have IDENT_DEFENCE set */
+        if (object_known_p(o_ptr) ||
+                        (o_ptr->ident & IDENT_DEFENCE) || (o_ptr->ident & IDENT_STORE))
+                return TRUE;
+        else
+                return FALSE;
 }
 

trunk/src/object/obj-desc.c

@@ -529 +529 @@
                 size_t end, bool spoil)
 {
-        bool known = object_known_p(o_ptr) || (o_ptr->ident & IDENT_STORE) ||
-                        spoil;
-
         /* Dump base weapon info */
         switch (o_ptr->tval)
@@ -558 +555 @@
 
         /* Show weapon bonuses */
-        if (known || o_ptr->ident & IDENT_ATTACK)
+        if (spoil || object_attack_plusses_are_visible(o_ptr))
         {
                 if (obj_desc_show_weapon(o_ptr) || o_ptr->to_d)
@@ -568 +565 @@
 
         /* Show armor bonuses */
-        if (known || o_ptr->ident & IDENT_DEFENCE)
+        if (spoil || object_defence_plusses_are_visible(o_ptr))
         {
                 if (obj_desc_show_armor(o_ptr))

trunk/src/object/obj-info.c

@@ -572 +572 @@
 
                 xtra_postcrit = state.dis_to_d * 10;
-                if (object_known_p(o_ptr) || o_ptr->ident & IDENT_ATTACK)
+                if (object_attack_plusses_are_visible(o_ptr))
                 {
                         xtra_precrit += o_ptr->to_d * 10;

trunk/src/object/obj-util.c

@@ -1491 +1491 @@
                 memcpy(j_ptr, o_ptr, sizeof(object_type));
                 memcpy(j_ptr->flags, j_ptr->known_flags, sizeof(j_ptr->flags));
-                if (!(o_ptr->ident & IDENT_ATTACK))
+                if (!object_attack_plusses_are_visible(o_ptr))
                         j_ptr->to_h = j_ptr->to_d = 0;
-                else if (!(o_ptr->ident & IDENT_DEFENCE))
+                else if (!object_defence_plusses_are_visible(o_ptr))
                         j_ptr->to_a = 0;
 

trunk/src/object/object.h

@@ -56 +56 @@
 extern s32b object_last_wield;
 
+bool object_attack_plusses_are_visible(const object_type *o_ptr);
+bool object_defence_plusses_are_visible(const object_type *o_ptr);
 void object_known(object_type *o_ptr);
 void object_aware(object_type *o_ptr);

trunk/src/player/calcs.c

@@ -682 +682 @@
 
                 /* Apply the mental bonuses to armor class, if known */
-                if (object_known_p(o_ptr) || o_ptr->ident & IDENT_DEFENCE)
+                if (object_defence_plusses_are_visible(o_ptr))
                         state->dis_to_a += o_ptr->to_a;
 
@@ -699 +699 @@
 
                 /* Apply the mental bonuses tp hit/damage, if known */
-                if (object_known_p(o_ptr) || (o_ptr->ident & IDENT_ATTACK))
+                if (object_attack_plusses_are_visible(o_ptr))
                 {
                         state->dis_to_h += o_ptr->to_h;