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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.37 by root, Tue Jul 31 17:33:14 2007 UTC vs.
Revision 1.38 by elmex, Tue Jul 31 18:28:46 2007 UTC

  */
 int
 check_altar_sacrifice (const object *altar, const object *sacrifice)
 {
-  if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER)
+  if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
+      && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
+      && sacrifice->type != PLAYER)
     {
+      if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
+          && sacrifice->type == MONEY
+          && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
+        return 1;
       if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
            || ARCH_SACRIFICE (altar) == sacrifice->name
            || ARCH_SACRIFICE (altar) == sacrifice->slaying
-           || (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
+           || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
           && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
-        return 1;
-      if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
-          && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
         return 1;
     }
   return 0;
 }

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