| … | |
… | |
| 474 | { |
474 | { |
| 475 | object *head = tmp->head_ (); |
475 | object *head = tmp->head_ (); |
| 476 | |
476 | |
| 477 | /* See comment in TRIGGER_BUTTON about move_types */ |
477 | /* See comment in TRIGGER_BUTTON about move_types */ |
| 478 | if (((head->move_type & op->move_on) || head->move_type == 0) |
478 | if (((head->move_type & op->move_on) || head->move_type == 0) |
| 479 | && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) |
479 | && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER))) |
| 480 | { |
480 | { |
| 481 | push = 1; |
481 | push = 1; |
| 482 | break; |
482 | break; |
| 483 | } |
483 | } |
| 484 | } |
484 | } |
| … | |
… | |
| 811 | // FALL THROUGH |
811 | // FALL THROUGH |
| 812 | case 5: // kill all alives |
812 | case 5: // kill all alives |
| 813 | if (!tmp->flag [FLAG_PRECIOUS]) |
813 | if (!tmp->flag [FLAG_PRECIOUS]) |
| 814 | { |
814 | { |
| 815 | archetype::get (shstr_burnout)->insert_at (tmp, source); |
815 | archetype::get (shstr_burnout)->insert_at (tmp, source); |
| 816 | tmp->destroy (true); |
816 | tmp->destroy (); |
| 817 | } |
817 | } |
| 818 | break; |
818 | break; |
| 819 | |
819 | |
| 820 | default: |
820 | default: |
| 821 | break; |
821 | break; |
