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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.54 by root, Sun Oct 11 18:18:03 2009 UTC vs.
Revision 1.70 by root, Mon Oct 29 23:55:52 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and 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 <support@deliantra.net>
  */
 #include <global.h>
        * is getting moved out of memory, the status of buttons and levers
        * probably isn't important - it will get sorted out when the map is
        * re-loaded.  As such, just exit this function if that is the case.
        */
-      if (QUERY_FLAG (ol->ob, FLAG_FREED))
+      if (ol->ob->flag [FLAG_FREED])
         return;
       object *tmp = ol->ob;
       /* if the criteria isn't appropriate, don't do anything */
-      if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
+      if (state && !tmp->flag [FLAG_ACTIVATE_ON_PUSH])
         continue;
-      if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
+      if (!state && !tmp->flag [FLAG_ACTIVATE_ON_RELEASE])
         continue;
       switch (tmp->type)
         {
           case GATE:
                                : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
             tmp->value = tmp->stats.maxsp ? !state : state;
             tmp->set_speed (0.5);
             break;
-          case CF_HANDLE:
+          case T_HANDLE:
             SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
             update_object (tmp, UP_OBJ_FACE);
             break;
           case SIGN:
             if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
               {
-                tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
+                tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("msg_voice"));
+                if (originator && originator->contr)
+                  originator->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &tmp->name, &tmp->msg));
-                new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
+                new_info_map_except (NDI_UNIQUE | NDI_NAVY, tmp->map, originator, tmp->msg);
                 if (tmp->stats.food)
                   tmp->last_eat++;
               }
             break;
               }
             break;
           case DIRECTOR:
           case FIREWALL:
-            if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
+            if (!tmp->flag [FLAG_ANIMATE] && tmp->type == FIREWALL)
               move_firewall (tmp);
             else
               {
                 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
                 animate_turning (tmp);
             any_down = any_down || tmp->value;
           }
         else if (tmp->type == PEDESTAL)
           {
+            bool is_match = is_match_expr (tmp->slaying);
             tmp->value = 0;
             for (object *ab = tmp->above; ab; ab = ab->above)
               {
                 object *head = ab->head_ ();
                 /* Same note regarding move_type for buttons above apply here. */
-                if (((ab->move_type & tmp->move_on) || ab->move_type == 0)
+                if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
+                  if (is_match
+                      ? match (tmp->slaying, head, tmp, originator)
-                    && (head->race == tmp->slaying
+                      : (head->race == tmp->slaying
-                        || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
+                         || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
-                        || (tmp->slaying == shstr_player && head->type == PLAYER)))
+                         || (tmp->slaying == shstr_player && head->type == PLAYER)))
+                    {
-                  tmp->value = 1;
+                      tmp->value = 1;
+                      break;
+                    }
+              }
+            any_down = any_down || tmp->value;
+          }
+        else if (tmp->type == T_MATCH)
+          {
+            tmp->value = 0;
+            for (object *ab = tmp->above; ab; ab = ab->above)
+              {
+                object *head = ab->head_ ();
+                /* Same note regarding move_type for buttons above apply here. */
+                if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
+                  if (match (tmp->slaying, head, tmp, originator))
+                    {
+                      tmp->value = 1;
+                      break;
+                    }
               }
             any_down = any_down || tmp->value;
           }
       }
  *
  * 0.93.4: Linked objects (ie, objects that are connected) can not be
  * sacrificed.  This fixes a bug of trying to put multiple altars/related
  * 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 (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
+  if (!sacrifice->flag [FLAG_ALIVE])
-      && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
-      && sacrifice->type != PLAYER)
     {
       if (ARCH_SACRIFICE (altar) == shstr_money
           && sacrifice->type == MONEY
           && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
         return 1;
     new_info_map (NDI_BLACK, altar->map, altar->msg);
   return 1;
 }
-void
+static void
 trigger_move (object *op, int state, object *originator)    /* 1 down and 0 up */
 {
   op->stats.wc = state;
   if (state)
 int
 check_trigger (object *op, object *cause, object *originator)
 {
   object *tmp;
   int push = 0, tot = 0;
-  int in_movement = op->stats.wc || op->speed;
+  int in_movement = op->stats.wc || op->has_active_speed ();
   switch (op->type)
     {
       case TRIGGER_BUTTON:
         if (op->weight > 0)
     return;
   object *tmp;
   for (tmp = ms.top; tmp; tmp = tmp->below)
-    if (QUERY_FLAG (tmp, FLAG_MONSTER))
+    if (tmp->flag [FLAG_MONSTER])
       break;
   /* doesn't effect players, and if there is a player on this space, won't also
    * be a monster here.
    */
     return;
   switch (op->last_sp)
     {
       case 0:                /* furious--make all monsters mad */
-        if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
+        if (tmp->flag [FLAG_UNAGGRESSIVE])
-          CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
+          tmp->clr_flag (FLAG_UNAGGRESSIVE);
-        if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
+        if (tmp->flag [FLAG_FRIENDLY])
           {
             tmp->attack_movement = 0;
             /* lots of checks here, but want to make sure we don't
              * dereference a null value
              */
             remove_friendly_object (tmp);
           }
         break;
       case 1:                /* angry -- get neutral monsters mad */
-        if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
+        if (tmp->flag [FLAG_UNAGGRESSIVE] && !tmp->flag [FLAG_FRIENDLY])
-          CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
+          tmp->clr_flag (FLAG_UNAGGRESSIVE);
         break;
       case 2:                /* calm -- pacify unfriendly monsters */
-        SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
+        tmp->set_flag (FLAG_UNAGGRESSIVE);
         break;
       case 3:                /* make all monsters fall asleep */
-        SET_FLAG (tmp, FLAG_SLEEP);
+        tmp->set_flag (FLAG_SLEEP);
         break;
       case 4:                /* charm all monsters */
         if (op == source)
           break;              /* only if 'connected' */
         if (object *pl = source->ms ().player ())
           {
             tmp->set_owner (pl);
-            SET_FLAG (tmp, FLAG_MONSTER);
+            tmp->set_flag (FLAG_MONSTER);
             tmp->stats.exp = 0;
             add_friendly_object (tmp);
             tmp->attack_movement = PETMOVE;
           }
         break;
       case 6: // kill monsters
-        if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
+        if (!tmp->flag [FLAG_FRIENDLY])
           break;
         // FALL THROUGH
       case 5: // kill all alives
         if (!tmp->flag [FLAG_PRECIOUS])

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.54 by root, Sun Oct 11 18:18:03 2009 UTC vs. Revision 1.70 by root, Mon Oct 29 23:55:52 2012 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.54 by root, Sun Oct 11 18:18:03 2009 UTC vs.
Revision 1.70 by root, Mon Oct 29 23:55:52 2012 UTC