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.53 by root, Tue Apr 22 07:01:47 2008 UTC vs.
Revision 1.54 by root, Wed Apr 30 10:31:04 2008 UTC

1598 } 1598 }
1599 1599
1600 /* charm */ 1600 /* charm */
1601 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1601 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1602 { 1602 {
1603 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1604
1603 /* Prevent uncontolled outbreaks of self replicating monsters. 1605 /* Prevent uncontrolled outbreaks of self replicating monsters.
1604 Typical use case is charm, go somwhere, use aggravation to make hostile. 1606 Typical use case is charm, go somwhere, use aggravation to make hostile.
1605 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1607 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1606 CLEAR_FLAG (head, FLAG_GENERATOR); 1608 CLEAR_FLAG (head, FLAG_GENERATOR);
1607 head->set_owner (op); 1609 head->set_owner (op);
1608 set_spell_skill (op, caster, spell, head); 1610 set_spell_skill (op, caster, spell, head);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines