[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.26 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.27 by root, Mon Jan 8 01:19:04 2007 UTC

         if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
           {
             SET_FLAG (head, FLAG_BERSERK);
             done_one = 1;
           }
         /* charm */
         if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
           {
-            SET_FLAG (head, FLAG_FRIENDLY);
             /* Prevent uncontolled outbreaks of self replicating monsters.
                Typical use case is charm, go somwhere, use aggravation to make hostile.
                This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
             CLEAR_FLAG (head, FLAG_GENERATOR);
             head->set_owner (op);

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