When an object has activation flag and xtra2=0, restore activation index by referring...

diff --git a/src/cmd6.c b/src/cmd6.c
index 3b63406..68a2272 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -4119,10 +4119,14 @@ static void do_cmd_activate_aux(int item)
        {
                if (!o_ptr->xtra2) o_ptr->xtra2 = a_info[o_ptr->name1].act_idx;
        }
-       if (object_is_ego(o_ptr))
+       else if (object_is_ego(o_ptr))
        {
                if (!o_ptr->xtra2) o_ptr->xtra2 = e_info[o_ptr->name2].act_idx;
        }
+       else
+       {
+               if (!o_ptr->xtra2) o_ptr->xtra2 = k_info[o_ptr->k_idx].act_idx;
+       }
 
        /* Activate object */
        /* if (o_ptr->xtra2 && (object_is_artifact(o_ptr) || object_is_ego(o_ptr))) */

diff --git a/src/object1.c b/src/object1.c
index e0dab5a..40fbdad 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -423,10 +423,14 @@ cptr item_activation(object_type *o_ptr)
        {
                if (!o_ptr->xtra2) o_ptr->xtra2 = a_info[o_ptr->name1].act_idx;
        }
-       if (object_is_ego(o_ptr))
+       else if (object_is_ego(o_ptr))
        {
                if (!o_ptr->xtra2) o_ptr->xtra2 = e_info[o_ptr->name2].act_idx;
        }
+       else
+       {
+               if (!o_ptr->xtra2) o_ptr->xtra2 = k_info[o_ptr->k_idx].act_idx;
+       }
 
        /* Get an explain of an activation */
        /* if ((object_is_artifact(o_ptr) || object_is_ego(o_ptr)) && (o_ptr->xtra2)) */