Changeset 1464 for trunk

Timestamp:

07/03/09 22:14:12 (14 months ago)

Author:

takkaria

Message:

• Stop requiring full knowledge to merge various item kinds. (Eddie Grove)
• Stop requiring knowledge in order to activate things. (Eddie Grove)

Files:

• trunk/src/object/obj-util.c (modified) (9 diffs)

trunk/src/object/obj-util.c

@@ -1523 +1523 @@
 bool object_similar(const object_type *o_ptr, const object_type *j_ptr)
 {
+        int i;
         int total = o_ptr->number + j_ptr->number;
 
@@ -1564 +1565 @@
                 }
 
-                /* Weapons and Armor */
+                /* Weaponsm, armour and jewelery */
                 case TV_BOW:
                 case TV_DIGGING:
@@ -1579 +1580 @@
                 case TV_HARD_ARMOR:
                 case TV_DRAG_ARMOR:
-                {
-                        /* Fall through */
-                }
-
-                /* Rings, Amulets, Lites */
                 case TV_RING:
                 case TV_AMULET:
                 case TV_LITE:
                 {
-                        /* Require both items to be known */
-                        if (!object_known_p(o_ptr) || !object_known_p(j_ptr)) return (0);
-
                         /* Fall through */
                 }
@@ -1599 +1592 @@
                 case TV_SHOT:
                 {
-                        /* Require identical knowledge of both items */
-                        if (object_known_p(o_ptr) != object_known_p(j_ptr)) return (0);
-
                         /* Require identical "bonuses" */
                         if (o_ptr->to_h != j_ptr->to_h) return (FALSE);
@@ -1636 +1626 @@
                 default:
                 {
-                        /* Require knowledge */
-                        if (!object_known_p(o_ptr) || !object_known_p(j_ptr)) return (0);
-
                         /* Probably okay */
                         break;
@@ -1654 +1641 @@
 
         /* Different flags */
-        if (o_ptr->flags[0] != j_ptr->flags[0] ||
-                o_ptr->flags[1] != j_ptr->flags[1] ||
-                o_ptr->flags[2] != j_ptr->flags[2])
-                return FALSE;
+        for (i = 0; i < OBJ_FLAG_N; i++)
+                if (o_ptr->flags[i] != j_ptr->flags[1])
+                        return FALSE;
 
 
@@ -1689 +1675 @@
         object_kind *k_ptr = &k_info[o_ptr->k_idx];
 
+        int i;
         int total = o_ptr->number + j_ptr->number;
 
@@ -1694 +1681 @@
         o_ptr->number = ((total < MAX_STACK_SIZE) ? total : (MAX_STACK_SIZE - 1));
 
-        /* Hack -- Blend "known" status */
-        if (object_known_p(j_ptr)) object_known(o_ptr);
-
-        /* Hack -- Blend store status */
-        if (j_ptr->ident & (IDENT_STORE)) o_ptr->ident |= (IDENT_STORE);
+        /* Blend all knowledge */
+        o_ptr->ident |= (j_ptr->ident & ~IDENT_EMPTY);
+        for (i = 0; i < OBJ_FLAG_N; i++)
+                o_ptr->known_flags[i] |= j_ptr->known_flags[i];
 
         /* Hack -- Blend "notes" */
@@ -3593 +3579 @@
         u32b f[OBJ_FLAG_N];
 
-        /* Not known */
-        if (!object_known_p(o_ptr)) return (FALSE);
-
         /* Extract the flags */
         object_flags(o_ptr, f);