--- deliantra/server/common/button.C	2007/07/31 17:33:14	1.37
+++ deliantra/server/common/button.C	2007/08/27 01:13:48	1.39
@@ -69,6 +69,10 @@
         {
           case GATE:
           case HOLE:
+            if (!tmp->active)
+              tmp->play_sound (tmp->sound
+                               ? tmp->sound
+                               : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
             tmp->value = tmp->stats.maxsp ? !state : state;
             tmp->set_speed (0.5);
             break;
@@ -81,7 +85,7 @@
           case SIGN:
             if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
               {
-                tmp->play_sound (tmp->sound);
+                tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
                 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
                 if (tmp->stats.food)
                   tmp->last_eat++;
@@ -89,6 +93,7 @@
             break;
 
           case ALTAR:
+            tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
             tmp->value = 1;
             SET_ANIMATION (tmp, tmp->value);
             update_object (tmp, UP_OBJ_FACE);
@@ -96,6 +101,7 @@
 
           case BUTTON:
           case PEDESTAL:
+            tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
             tmp->value = state;
             SET_ANIMATION (tmp, tmp->value);
             update_object (tmp, UP_OBJ_FACE);
@@ -106,6 +112,8 @@
             break;
 
           case TIMED_GATE:
+            if (!tmp->active)
+              tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
             tmp->set_speed (tmp->arch->speed);
             tmp->value = tmp->arch->value;
             tmp->stats.sp = 1;
@@ -144,6 +152,7 @@
             break;
 
           case TRIGGER_MARKER:
+            //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
             move_marker (tmp);
             break;
 
@@ -317,18 +326,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;