… | |
… | |
165 | sint16 x, y; |
165 | sint16 x, y; |
166 | maptile *m; |
166 | maptile *m; |
167 | |
167 | |
168 | if (--op->duration < 0) |
168 | if (--op->duration < 0) |
169 | { |
169 | { |
170 | op->destroy (); |
170 | op->drop_and_destroy (); |
171 | return; |
171 | return; |
172 | } |
172 | } |
173 | |
173 | |
174 | hit_map (op, 0, op->attacktype, 1); |
174 | hit_map (op, 0, op->attacktype, 1); |
175 | |
175 | |
… | |
… | |
307 | |
307 | |
308 | maptile *newmap; |
308 | maptile *newmap; |
309 | mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); |
309 | mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); |
310 | if (mflags & P_OUT_OF_MAP) |
310 | if (mflags & P_OUT_OF_MAP) |
311 | { |
311 | { |
312 | tmp->destroy (); |
312 | tmp->drop_and_destroy (); |
313 | return 0; |
313 | return 0; |
314 | } |
314 | } |
315 | |
315 | |
316 | tmp->map = newmap; |
316 | tmp->map = newmap; |
317 | |
317 | |
318 | if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) |
318 | if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) |
319 | { |
319 | { |
320 | if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) |
320 | if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) |
321 | { |
321 | { |
322 | tmp->destroy (); |
322 | tmp->drop_and_destroy (); |
323 | return 0; |
323 | return 0; |
324 | } |
324 | } |
325 | |
325 | |
326 | tmp->x = op->x; |
326 | tmp->x = op->x; |
327 | tmp->y = op->y; |
327 | tmp->y = op->y; |
… | |
… | |
393 | void |
393 | void |
394 | explode_bullet (object *op) |
394 | explode_bullet (object *op) |
395 | { |
395 | { |
396 | object *tmp, *owner; |
396 | object *tmp, *owner; |
397 | |
397 | |
398 | if (op->other_arch == NULL) |
398 | if (!op->other_arch) |
399 | { |
399 | { |
400 | LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); |
400 | LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); |
401 | op->destroy (); |
401 | op->destroy (); |
402 | return; |
402 | return; |
403 | } |
403 | } |
… | |
… | |
445 | tmp->set_owner (op); |
445 | tmp->set_owner (op); |
446 | tmp->skill = op->skill; |
446 | tmp->skill = op->skill; |
447 | |
447 | |
448 | owner = op->owner; |
448 | owner = op->owner; |
449 | |
449 | |
450 | if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) |
450 | if ((tmp->attacktype & AT_HOLYWORD |
|
|
451 | || tmp->attacktype & AT_GODPOWER) |
|
|
452 | && owner |
|
|
453 | && !tailor_god_spell (tmp, owner)) |
451 | { |
454 | { |
452 | op->destroy (); |
455 | op->destroy (); |
453 | return; |
456 | return; |
454 | } |
457 | } |
455 | |
458 | |
… | |
… | |
521 | { |
524 | { |
522 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
525 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
523 | { |
526 | { |
524 | dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); |
527 | dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); |
525 | |
528 | |
|
|
529 | // TODO: can't understand the following if's |
526 | if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) |
530 | if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) |
527 | { |
531 | { |
528 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
532 | if (!QUERY_FLAG (op, FLAG_REMOVED)) |
529 | { |
533 | { |
530 | op->destroy (); |
534 | op->destroy (); |
… | |
… | |
733 | } |
737 | } |
734 | #endif |
738 | #endif |
735 | |
739 | |
736 | hit_map (op, 0, op->attacktype, 0); |
740 | hit_map (op, 0, op->attacktype, 0); |
737 | |
741 | |
|
|
742 | if (!op->is_on_map ()) |
|
|
743 | return; |
|
|
744 | |
738 | /* Check to see if we should push anything. |
745 | /* Check to see if we should push anything. |
739 | * Spell objects with weight push whatever they encounter to some |
746 | * Spell objects with weight push whatever they encounter to some |
740 | * degree. |
747 | * degree. |
741 | */ |
748 | */ |
742 | if (op->weight) |
749 | if (op->weight) |
|
|
750 | { |
743 | check_spell_knockback (op); |
751 | check_spell_knockback (op); |
744 | |
752 | |
745 | if (op->destroyed ()) |
753 | if (!op->is_on_map ()) |
746 | return; |
754 | return; |
|
|
755 | } |
747 | |
756 | |
748 | if (op->duration-- < 0) |
757 | if (op->duration-- < 0) |
749 | { |
758 | { |
750 | op->destroy (); |
759 | op->destroy (); |
751 | return; |
760 | return; |
… | |
… | |
860 | |
869 | |
861 | success = 1; |
870 | success = 1; |
862 | tmp = arch_to_object (spell->other_arch); |
871 | tmp = arch_to_object (spell->other_arch); |
863 | tmp->set_owner (op); |
872 | tmp->set_owner (op); |
864 | set_spell_skill (op, caster, spell, tmp); |
873 | set_spell_skill (op, caster, spell, tmp); |
865 | tmp->level = caster_level (caster, spell); |
874 | tmp->level = casting_level (caster, spell); |
866 | tmp->attacktype = spell->attacktype; |
875 | tmp->attacktype = spell->attacktype; |
867 | |
876 | |
868 | /* holy word stuff */ |
877 | /* holy word stuff */ |
869 | if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) |
878 | if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) |
870 | if (!tailor_god_spell (tmp, op)) |
879 | if (!tailor_god_spell (tmp, op)) |
… | |
… | |
1112 | effect = arch_to_object (spell->other_arch); |
1121 | effect = arch_to_object (spell->other_arch); |
1113 | else |
1122 | else |
1114 | return 0; |
1123 | return 0; |
1115 | |
1124 | |
1116 | /* tailor the effect by priest level and worshipped God */ |
1125 | /* tailor the effect by priest level and worshipped God */ |
1117 | effect->level = caster_level (caster, spell); |
1126 | effect->level = casting_level (caster, spell); |
1118 | effect->attacktype = spell->attacktype; |
1127 | effect->attacktype = spell->attacktype; |
1119 | if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) |
1128 | if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER)) |
1120 | { |
1129 | { |
1121 | if (tailor_god_spell (effect, op)) |
1130 | if (tailor_god_spell (effect, op)) |
1122 | new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); |
1131 | new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op)); |
… | |
… | |
1179 | void |
1188 | void |
1180 | move_missile (object *op) |
1189 | move_missile (object *op) |
1181 | { |
1190 | { |
1182 | if (op->range-- <= 0) |
1191 | if (op->range-- <= 0) |
1183 | { |
1192 | { |
1184 | op->destroy (); |
1193 | op->drop_and_destroy (); |
1185 | return; |
1194 | return; |
1186 | } |
1195 | } |
1187 | |
1196 | |
1188 | mapxy pos (op); |
1197 | mapxy pos (op); |
1189 | pos.move (op->direction); |
1198 | pos.move (op->direction); |
… | |
… | |
1451 | |
1460 | |
1452 | /* We precompute some values here so that we don't have to keep |
1461 | /* We precompute some values here so that we don't have to keep |
1453 | * doing it over and over again. |
1462 | * doing it over and over again. |
1454 | */ |
1463 | */ |
1455 | god = find_god (determine_god (op)); |
1464 | god = find_god (determine_god (op)); |
1456 | level = caster_level (caster, spell); |
1465 | level = casting_level (caster, spell); |
1457 | range = spell->range + SP_level_range_adjust (caster, spell); |
1466 | range = spell->range + SP_level_range_adjust (caster, spell); |
1458 | |
1467 | |
1459 | /* On the bright side, no monster should ever have a race of GOD_... |
1468 | /* On the bright side, no monster should ever have a race of GOD_... |
1460 | * so even if the player doesn't worship a god, if race=GOD_.., it |
1469 | * so even if the player doesn't worship a god, if race=GOD_.., it |
1461 | * won't ever match anything. |
1470 | * won't ever match anything. |
… | |
… | |
1739 | return; |
1748 | return; |
1740 | } |
1749 | } |
1741 | |
1750 | |
1742 | if (!op->duration || !owner->is_on_map ()) |
1751 | if (!op->duration || !owner->is_on_map ()) |
1743 | { |
1752 | { |
1744 | op->destroy (); |
1753 | op->drop_and_destroy (); |
1745 | return; |
1754 | return; |
1746 | } |
1755 | } |
1747 | |
1756 | |
1748 | op->duration--; |
1757 | op->duration--; |
1749 | |
1758 | |
… | |
… | |
1845 | return 0; |
1854 | return 0; |
1846 | |
1855 | |
1847 | object *tmp = archetype::get (SWARM_SPELL); |
1856 | object *tmp = archetype::get (SWARM_SPELL); |
1848 | |
1857 | |
1849 | set_spell_skill (op, caster, spell, tmp); |
1858 | set_spell_skill (op, caster, spell, tmp); |
1850 | tmp->level = caster_level (caster, spell); /* needed later, to get level dep. right. */ |
1859 | tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */ |
1851 | tmp->spell = spell->other_arch->instance (); |
1860 | tmp->spell = spell->other_arch->instance (); |
1852 | tmp->attacktype = tmp->spell->attacktype; |
1861 | tmp->attacktype = tmp->spell->attacktype; |
1853 | |
1862 | |
1854 | if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) |
1863 | if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) |
1855 | if (!tailor_god_spell (tmp, op)) |
1864 | if (!tailor_god_spell (tmp, op)) |
… | |
… | |
1998 | object *disease = arch_to_object (spell->other_arch); |
2007 | object *disease = arch_to_object (spell->other_arch); |
1999 | |
2008 | |
2000 | disease->set_owner (op); |
2009 | disease->set_owner (op); |
2001 | set_spell_skill (op, caster, spell, disease); |
2010 | set_spell_skill (op, caster, spell, disease); |
2002 | disease->stats.exp = 0; |
2011 | disease->stats.exp = 0; |
2003 | disease->level = caster_level (caster, spell); |
2012 | disease->level = casting_level (caster, spell); |
2004 | |
2013 | |
2005 | /* do level adjustments */ |
2014 | /* do level adjustments */ |
2006 | if (disease->stats.wc) |
2015 | if (disease->stats.wc) |
2007 | disease->stats.wc += dur_mod / 2; |
2016 | disease->stats.wc += dur_mod / 2; |
2008 | |
2017 | |