| … | |
… | |
| 518 | |
518 | |
| 519 | /* If nothing alive on this space, no reason to do anything further */ |
519 | /* If nothing alive on this space, no reason to do anything further */ |
| 520 | if (!(mflags & P_IS_ALIVE)) |
520 | if (!(mflags & P_IS_ALIVE)) |
| 521 | return; |
521 | return; |
| 522 | |
522 | |
| 523 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) |
523 | for (tmp = op->ms ().bot; tmp; tmp = tmp->above) |
| 524 | { |
524 | { |
| 525 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
525 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
| 526 | { |
526 | { |
| 527 | dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); |
527 | dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); |
| 528 | if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) |
528 | if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) |
| … | |
… | |
| 604 | } |
604 | } |
| 605 | else |
605 | else |
| 606 | check_bullet (op); |
606 | check_bullet (op); |
| 607 | } |
607 | } |
| 608 | |
608 | |
| 609 | |
|
|
| 610 | |
|
|
| 611 | |
|
|
| 612 | /* fire_bullet |
609 | /* fire_bullet |
| 613 | * object op (cast from caster) files a bolt in dir. |
610 | * object op (cast from caster) files a bolt in dir. |
| 614 | * spob is the spell object for the bolt. |
611 | * spob is the spell object for the bolt. |
| 615 | * we remove the magic flag - that can be derived from |
612 | * we remove the magic flag - that can be derived from |
| 616 | * spob->attacktype. |
613 | * spob->attacktype. |
| … | |
… | |
| 683 | check_bullet (tmp); |
680 | check_bullet (tmp); |
| 684 | |
681 | |
| 685 | return 1; |
682 | return 1; |
| 686 | } |
683 | } |
| 687 | |
684 | |
| 688 | |
|
|
| 689 | |
|
|
| 690 | |
|
|
| 691 | /***************************************************************************** |
685 | /***************************************************************************** |
| 692 | * |
686 | * |
| 693 | * CONE RELATED FUNCTIONS |
687 | * CONE RELATED FUNCTIONS |
| 694 | * |
688 | * |
| 695 | *****************************************************************************/ |
689 | *****************************************************************************/ |
| 696 | |
|
|
| 697 | |
690 | |
| 698 | /* drops an object based on what is in the cone's "other_arch" */ |
691 | /* drops an object based on what is in the cone's "other_arch" */ |
| 699 | void |
692 | void |
| 700 | cone_drop (object *op) |
693 | cone_drop (object *op) |
| 701 | { |
694 | { |
| … | |
… | |
| 1807 | #if 0 |
1800 | #if 0 |
| 1808 | // this is bogus: it causes wrong places to be checked below |
1801 | // this is bogus: it causes wrong places to be checked below |
| 1809 | // (a wall 2 cells away will block the effect...) and |
1802 | // (a wall 2 cells away will block the effect...) and |
| 1810 | // doesn't work for SP_BULLET anyhow, so again tests the wrong |
1803 | // doesn't work for SP_BULLET anyhow, so again tests the wrong |
| 1811 | // space. |
1804 | // space. |
| 1812 | // should be fixed later, but correctness before featurs... |
1805 | // should be fixed later, but correctness before features... |
| 1813 | // (schmorp) |
1806 | // (schmorp) |
| 1814 | |
1807 | |
| 1815 | /* new offset calculation to make swarm element distribution |
1808 | /* new offset calculation to make swarm element distribution |
| 1816 | * more uniform |
1809 | * more uniform |
| 1817 | */ |
1810 | */ |
