| … | |
… | |
| 398 | /* If we don't have an enemy, do special movement or the like */ |
398 | /* If we don't have an enemy, do special movement or the like */ |
| 399 | if (!enemy) |
399 | if (!enemy) |
| 400 | { |
400 | { |
| 401 | if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) |
401 | if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) |
| 402 | { |
402 | { |
| 403 | remove_ob (op); |
403 | op->remove (); |
| 404 | free_object (op); |
404 | op->destroy (0); |
| 405 | return 1; |
405 | return 1; |
| 406 | } |
406 | } |
| 407 | |
407 | |
| 408 | /* Probably really a bug for a creature to have both |
408 | /* Probably really a bug for a creature to have both |
| 409 | * stand still and a movement type set. |
409 | * stand still and a movement type set. |
| … | |
… | |
| 667 | if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */ |
667 | if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */ |
| 668 | return 1; |
668 | return 1; |
| 669 | |
669 | |
| 670 | if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) |
670 | if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) |
| 671 | { |
671 | { |
| 672 | remove_ob (op); |
672 | op->remove (); |
| 673 | free_object (op); |
673 | op->destroy (0); |
| 674 | return 1; |
674 | return 1; |
| 675 | } |
675 | } |
| 676 | return 0; |
676 | return 0; |
| 677 | } |
677 | } |
| 678 | |
678 | |
| … | |
… | |
| 1153 | for (tmp = monster->below; tmp != NULL; tmp = next) |
1153 | for (tmp = monster->below; tmp != NULL; tmp = next) |
| 1154 | { |
1154 | { |
| 1155 | next = tmp->below; |
1155 | next = tmp->below; |
| 1156 | if (monster_can_pick (monster, tmp)) |
1156 | if (monster_can_pick (monster, tmp)) |
| 1157 | { |
1157 | { |
| 1158 | remove_ob (tmp); |
1158 | tmp->remove (); |
| 1159 | tmp = insert_ob_in_ob (tmp, monster); |
1159 | tmp = insert_ob_in_ob (tmp, monster); |
| 1160 | (void) monster_check_apply (monster, tmp); |
1160 | (void) monster_check_apply (monster, tmp); |
| 1161 | } |
1161 | } |
| 1162 | /* We could try to re-establish the cycling, of the space, but probably |
1162 | /* We could try to re-establish the cycling, of the space, but probably |
| 1163 | * not a big deal to just bail out. |
1163 | * not a big deal to just bail out. |
