--- deliantra/server/common/button.C	2007/07/01 05:00:17	1.36
+++ deliantra/server/common/button.C	2007/07/31 18:28:46	1.38
@@ -61,6 +61,7 @@
       /* if the criteria isn't appropriate, don't do anything */
       if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
         continue;
+
       if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
         continue;
 
@@ -80,6 +81,7 @@
           case SIGN:
             if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
               {
+                tmp->play_sound (tmp->sound);
                 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
                 if (tmp->stats.food)
                   tmp->last_eat++;
@@ -315,18 +317,21 @@
 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;