--- deliantra/server/common/button.C	2007/05/28 21:21:40	1.33
+++ deliantra/server/common/button.C	2007/08/27 01:13:48	1.39
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -62,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;
 
@@ -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,6 +85,7 @@
           case SIGN:
             if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
               {
+                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++;
@@ -88,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);
@@ -95,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);
@@ -105,8 +112,10 @@
             break;
 
           case TIMED_GATE:
-            tmp->set_speed (tmp->arch->clone.speed);
-            tmp->value = tmp->arch->clone.value;
+            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;
             tmp->stats.hp = tmp->stats.maxhp;
             /* Handle multipart gates.  We copy the value for the other parts
@@ -143,6 +152,7 @@
             break;
 
           case TRIGGER_MARKER:
+            //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
             move_marker (tmp);
             break;
 
@@ -316,17 +326,20 @@
 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 ((ARCH_SACRIFICE (altar) == sacrifice->arch->name ||
-           ARCH_SACRIFICE (altar) == sacrifice->name ||
-           ARCH_SACRIFICE (altar) == sacrifice->slaying ||
-           (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
-          && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
+      if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
+          && sacrifice->type == MONEY
+          && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
         return 1;
 
-      if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
-          && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
+      if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
+           || ARCH_SACRIFICE (altar) == sacrifice->name
+           || ARCH_SACRIFICE (altar) == sacrifice->slaying
+           || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
+          && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
         return 1;
     }
 
@@ -822,7 +835,7 @@
   /* First check the object itself. */
   if ((trig->stats.hp && (op->type == trig->stats.hp))
       || (trig->slaying && (op->slaying == trig->slaying))
-      || (trig->race && (op->arch->name == trig->race)))
+      || (trig->race && (op->arch->archname == trig->race)))
     return op;
 
   for (tmp = op->inv; tmp; tmp = tmp->below)
@@ -835,7 +848,7 @@
         }
       else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
                || (trig->slaying && (tmp->slaying == trig->slaying))
-               || (trig->race && (tmp->arch->name == trig->race)))
+               || (trig->race && (tmp->arch->archname == trig->race)))
         return tmp;
     }
   return NULL;