| Revision | ceff2214ac7829fb0ad4f08e49f10113d2803526 (tree) |
|---|---|
| Time | 2013-02-01 04:11:29 |
| Author | iks <iks@0568...> |
| Commiter | iks |
When an object has activation flag and xtra2=0, restore activation index by referring act_idx even if normal object.
src/cmd6.c (diff) src/object1.c (diff)| @@ -4119,10 +4119,14 @@ static void do_cmd_activate_aux(int item) | ||
| 4119 | 4119 | { |
| 4120 | 4120 | if (!o_ptr->xtra2) o_ptr->xtra2 = a_info[o_ptr->name1].act_idx; |
| 4121 | 4121 | } |
| 4122 | - if (object_is_ego(o_ptr)) | |
| 4122 | + else if (object_is_ego(o_ptr)) | |
| 4123 | 4123 | { |
| 4124 | 4124 | if (!o_ptr->xtra2) o_ptr->xtra2 = e_info[o_ptr->name2].act_idx; |
| 4125 | 4125 | } |
| 4126 | + else | |
| 4127 | + { | |
| 4128 | + if (!o_ptr->xtra2) o_ptr->xtra2 = k_info[o_ptr->k_idx].act_idx; | |
| 4129 | + } | |
| 4126 | 4130 | |
| 4127 | 4131 | /* Activate object */ |
| 4128 | 4132 | /* if (o_ptr->xtra2 && (object_is_artifact(o_ptr) || object_is_ego(o_ptr))) */ |
| @@ -423,10 +423,14 @@ cptr item_activation(object_type *o_ptr) | ||
| 423 | 423 | { |
| 424 | 424 | if (!o_ptr->xtra2) o_ptr->xtra2 = a_info[o_ptr->name1].act_idx; |
| 425 | 425 | } |
| 426 | - if (object_is_ego(o_ptr)) | |
| 426 | + else if (object_is_ego(o_ptr)) | |
| 427 | 427 | { |
| 428 | 428 | if (!o_ptr->xtra2) o_ptr->xtra2 = e_info[o_ptr->name2].act_idx; |
| 429 | 429 | } |
| 430 | + else | |
| 431 | + { | |
| 432 | + if (!o_ptr->xtra2) o_ptr->xtra2 = k_info[o_ptr->k_idx].act_idx; | |
| 433 | + } | |
| 430 | 434 | |
| 431 | 435 | /* Get an explain of an activation */ |
| 432 | 436 | /* if ((object_is_artifact(o_ptr) || object_is_ego(o_ptr)) && (o_ptr->xtra2)) */ |
Fork