ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_attack.C
(Generate patch)

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.29 by root, Mon Jan 29 16:11:48 2007 UTC vs.
Revision 1.32 by root, Tue Apr 24 12:32:16 2007 UTC

… …
163 */ 163 */
164 164
165void 165void
166move_bolt (object *op) 166move_bolt (object *op)
167{ 167{
168 object *tmp;
169 int mflags; 168 int mflags;
170 sint16 x, y; 169 sint16 x, y;
171 maptile *m; 170 maptile *m;
172 171
173 if (--op->duration < 0) 172 if (--op->duration < 0)
… …
519 518
520 /* 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 */
521 if (!(mflags & P_IS_ALIVE)) 520 if (!(mflags & P_IS_ALIVE))
522 return; 521 return;
523 522
524 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)
525 { 524 {
526 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
527 { 526 {
528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
529 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 528 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
… …
605 } 604 }
606 else 605 else
607 check_bullet (op); 606 check_bullet (op);
608} 607}
609 608
610
611
612
613/* fire_bullet 609/* fire_bullet
614 * object op (cast from caster) files a bolt in dir. 610 * object op (cast from caster) files a bolt in dir.
615 * spob is the spell object for the bolt. 611 * spob is the spell object for the bolt.
616 * we remove the magic flag - that can be derived from 612 * we remove the magic flag - that can be derived from
617 * spob->attacktype. 613 * spob->attacktype.
… …
684 check_bullet (tmp); 680 check_bullet (tmp);
685 681
686 return 1; 682 return 1;
687} 683}
688 684
689
690
691
692/***************************************************************************** 685/*****************************************************************************
693 * 686 *
694 * CONE RELATED FUNCTIONS 687 * CONE RELATED FUNCTIONS
695 * 688 *
696 *****************************************************************************/ 689 *****************************************************************************/
697
698 690
699/* 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" */
700void 692void
701cone_drop (object *op) 693cone_drop (object *op)
702{ 694{
… …
1611 1603
1612 /* aggravation */ 1604 /* aggravation */
1613 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1605 if (QUERY_FLAG (spell, FLAG_MONSTER))
1614 { 1606 {
1615 CLEAR_FLAG (head, FLAG_SLEEP); 1607 CLEAR_FLAG (head, FLAG_SLEEP);
1616 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1617 remove_friendly_object (head); 1608 remove_friendly_object (head);
1618
1619 done_one = 1; 1609 done_one = 1;
1620 head->enemy = op; 1610 head->enemy = op;
1621 } 1611 }
1622 1612
1623 /* calm monsters */ 1613 /* calm monsters */
… …
1723 * if this has an other_arch field, we insert that in 1713 * if this has an other_arch field, we insert that in
1724 * the surround spaces. 1714 * the surround spaces.
1725 */ 1715 */
1726 for (j = 0; j < 9; j++) 1716 for (j = 0; j < 9; j++)
1727 { 1717 {
1728 object *new_ob;
1729
1730 hx = nx + freearr_x[j]; 1718 hx = nx + freearr_x[j];
1731 hy = ny + freearr_y[j]; 1719 hy = ny + freearr_y[j];
1732 1720
1733 m = op->map; 1721 m = op->map;
1734 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1722 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1810#if 0 1798#if 0
1811 // this is bogus: it causes wrong places to be checked below 1799 // this is bogus: it causes wrong places to be checked below
1812 // (a wall 2 cells away will block the effect...) and 1800 // (a wall 2 cells away will block the effect...) and
1813 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1801 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1814 // space. 1802 // space.
1815 // should be fixed later, but correctness before featurs... 1803 // should be fixed later, but correctness before features...
1816 // (schmorp) 1804 // (schmorp)
1817 1805
1818 /* new offset calculation to make swarm element distribution 1806 /* new offset calculation to make swarm element distribution
1819 * more uniform 1807 * more uniform
1820 */ 1808 */
… …
2110 if (disease->stats.sp) 2098 if (disease->stats.sp)
2111 disease->stats.sp -= dam_mod; 2099 disease->stats.sp -= dam_mod;
2112 2100
2113 if (infect_object (walk, disease, 1)) 2101 if (infect_object (walk, disease, 1))
2114 { 2102 {
2115 object *flash; /* visual effect for inflicting disease */
2116
2117 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2103 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2118 2104
2119 disease->destroy (); /* don't need this one anymore */ 2105 disease->destroy (); /* don't need this one anymore */
2120 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op); 2106 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2121 return 1; 2107 return 1;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines