… | |
… | |
433 | switch (tmp->type) |
433 | switch (tmp->type) |
434 | { |
434 | { |
435 | case T_HANDLE: |
435 | case T_HANDLE: |
436 | case TRIGGER: |
436 | case TRIGGER: |
437 | if (monster->will_apply & 1) |
437 | if (monster->will_apply & 1) |
438 | manual_apply (monster, tmp, 0); |
438 | monster->apply (tmp); |
439 | break; |
439 | break; |
440 | |
440 | |
441 | case TREASURE: |
441 | case TREASURE: |
442 | if (monster->will_apply & 2) |
442 | if (monster->will_apply & 2) |
443 | manual_apply (monster, tmp, 0); |
443 | monster->apply (tmp); |
444 | break; |
444 | break; |
445 | |
445 | |
446 | } |
446 | } |
447 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
447 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
448 | break; |
448 | break; |
… | |
… | |
670 | |
670 | |
671 | /* should only be applying this item, not unapplying it. |
671 | /* should only be applying this item, not unapplying it. |
672 | * also, ignore status of curse so they can take off old armour. |
672 | * also, ignore status of curse so they can take off old armour. |
673 | * monsters have some advantages after all. |
673 | * monsters have some advantages after all. |
674 | */ |
674 | */ |
675 | manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE); |
675 | mon->apply (item, AP_APPLY | AP_IGNORE_CURSE); |
676 | } |
676 | } |
677 | |
677 | |
678 | static int |
678 | static int |
679 | can_hit (object *ob1, object *ob2, rv_vector * rv) |
679 | can_hit (object *ob1, object *ob2, rv_vector * rv) |
680 | { |
680 | { |