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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.52 by root, Thu Jan 8 04:35:03 2009 UTC vs.
Revision 1.55 by root, Mon Oct 12 04:02:17 2009 UTC

  * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
  * The activator argument can be 0 or the source object for this activation.
  * the originator is the player or monster who did something.
  */
 static void
-activate_connection_link (objectlink *ol, bool state, object *activator, object *originator)
+activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
 {
   for (; ol; ol = ol->next)
     {
       if (!ol->ob)
         {
           case FIREWALL:
             if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
               move_firewall (tmp);
             else
               {
-                if ((tmp->stats.sp += tmp->stats.maxsp) > 8)  /* next direction */
+                tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
-                  tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
                 animate_turning (tmp);
               }
             break;
           case TELEPORTER:
  * the connection was 'state' or 'released'. So that you can activate objects
  * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
  *
  */
 void
-maptile::trigger (shstr_tmp id, bool state, object *activator, object *originator)
+maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
 {
   if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
     return;
   if (oblinkpt *obp = find_link (id))
             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;
           }
       }
  * 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 (const object *altar, const object *sacrifice)
+check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
 {
+  if (sacrifice->flag [FLAG_UNPAID])
+    return 0;
+  if (is_match_expr (ARCH_SACRIFICE (altar)))
+    return match (ARCH_SACRIFICE (altar), altar, originator);
   if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
       && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
       && sacrifice->type != PLAYER)
     {
       if (ARCH_SACRIFICE (altar) == shstr_money
  *
  * If this function returns 1, '*sacrifice' is modified to point to the
  * remaining sacrifice, or is set to NULL if the sacrifice was used up.
  */
 int
-operate_altar (object *altar, object **sacrifice)
+operate_altar (object *altar, object **sacrifice, object *originator)
 {
   if (!altar->map)
     {
       LOG (llevError, "BUG: operate_altar(): altar has no map\n");
       return 0;
     }
   if (!altar->slaying || altar->value)
     return 0;
-  if (!check_altar_sacrifice (altar, *sacrifice))
+  if (!check_altar_sacrifice (altar, *sacrifice, originator))
     return 0;
   /* check_altar_sacrifice should have already verified that enough money
    * has been dropped.
    */
  * TRIGGER: Returns 1 if handle could be moved, 0 if not.
  *
  * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
  */
 int
-check_trigger (object *op, object *cause)
+check_trigger (object *op, object *cause, object *originator)
 {
   object *tmp;
   int push = 0, tot = 0;
   int in_movement = op->stats.wc || op->speed;
         if (cause)
           {
             if (in_movement)
               return 0;
-            if (operate_altar (op, &cause))
+            if (operate_altar (op, &cause)) /* TODO: originator? */
               {
                 if (NUM_ANIMATIONS (op) > 1)
                   {
                     SET_ANIMATION (op, 1);
                     update_object (op, UP_OBJ_FACE);

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.52 by root, Thu Jan 8 04:35:03 2009 UTC vs. Revision 1.55 by root, Mon Oct 12 04:02:17 2009 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.52 by root, Thu Jan 8 04:35:03 2009 UTC vs.
Revision 1.55 by root, Mon Oct 12 04:02:17 2009 UTC