[ViewVC] Diff of: cvs/deliantra/server/common/button.C

Comparing deliantra/server/common/button.C (file contents):
Revision 1.66 by root, Sun Apr 11 00:34:05 2010 UTC vs.
Revision 1.67 by root, Sat Aug 28 00:30:28 2010 UTC

  * objects on the same space that take the same sacrifice.
  */
 int
 check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
 {
-  if (sacrifice->flag [FLAG_UNPAID])
+  if (sacrifice->flag [FLAG_UNPAID]
+      || sacrifice->flag [FLAG_IS_LINKED]
+      || sacrifice->is_player ())
     return 0;
   if (is_match_expr (ARCH_SACRIFICE (altar)))
-    return match (ARCH_SACRIFICE (altar), altar, originator);
+    return match (ARCH_SACRIFICE (altar), sacrifice, altar, originator);
-  if (!sacrifice->flag [FLAG_ALIVE]
+  if (!sacrifice->flag [FLAG_ALIVE])
-      && !sacrifice->flag [FLAG_IS_LINKED]
-      && sacrifice->type != PLAYER)
     {
       if (ARCH_SACRIFICE (altar) == shstr_money
           && sacrifice->type == MONEY
           && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
         return 1;

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