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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.80 by root, Mon Sep 29 08:25:02 2008 UTC vs.
Revision 1.81 by root, Mon Sep 29 10:20:49 2008 UTC

786 if (failure <= -20 && failure > -40) /* wonder */ 786 if (failure <= -20 && failure > -40) /* wonder */
787 { 787 {
788 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname); 788 new_draw_info_format (NDI_UNIQUE, 0, op, "%s gives a sign to renew your faith.", godname);
789 tmp = get_archetype (SPELL_WONDER); 789 tmp = get_archetype (SPELL_WONDER);
790 cast_cone (op, op, 0, tmp); 790 cast_cone (op, op, 0, tmp);
791 tmp->destroy (); 791 tmp->destroy (true);
792 } 792 }
793 793
794 else if (failure <= -40 && failure > -60) /* confusion */ 794 else if (failure <= -40 && failure > -60) /* confusion */
795 { 795 {
796 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!"); 796 new_draw_info (NDI_UNIQUE, 0, op, "Your diety touches your mind!");
830 if (failure <= -20 && failure > -40) /* wonder */ 830 if (failure <= -20 && failure > -40) /* wonder */
831 { 831 {
832 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect."); 832 new_draw_info (NDI_UNIQUE, 0, op, "Your spell causes an unexpected effect.");
833 tmp = get_archetype (SPELL_WONDER); 833 tmp = get_archetype (SPELL_WONDER);
834 cast_cone (op, op, 0, tmp); 834 cast_cone (op, op, 0, tmp);
835 tmp->destroy (); 835 tmp->destroy (true);
836 } 836 }
837 837
838 else if (failure <= -40 && failure > -60) /* confusion */ 838 else if (failure <= -40 && failure > -60) /* confusion */
839 { 839 {
840 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!"); 840 new_draw_info (NDI_UNIQUE, 0, op, "Your magic recoils on you, making you confused!");
1472 1472
1473 case SP_MAGIC_MISSILE: 1473 case SP_MAGIC_MISSILE:
1474 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1474 if (QUERY_FLAG (victim, FLAG_ALIVE))
1475 { 1475 {
1476 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1476 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1477
1478 if (!spell->destroyed ())
1479 spell->destroy (); 1477 spell->destroy (true);
1480 } 1478 }
1481 break; 1479 break;
1482 1480
1483 case SP_MOVING_BALL: 1481 case SP_MOVING_BALL:
1484 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1482 if (QUERY_FLAG (victim, FLAG_ALIVE))
1485 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1483 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1486 else if (victim->materialname) 1484 else if (victim->materialname)
1487 save_throw_object (victim, spell->attacktype, spell); 1485 save_throw_object (victim, spell->attacktype, spell);
1488 break;
1489 }
1490}
1491 1486
1487 break;
1488 }
1489}
1490

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines