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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.51 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.61 by root, Fri Nov 6 13:03:34 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 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>
 /*
  * elmex:
  * This function takes a objectlink list with all the objects are going to be activated.
  * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
- * The source argument can be 0 or the source object for this activation.
+ * The activator argument can be 0 or the source object for this activation.
+ * the originator is the player or monster who did something.
  */
-void
+static void
-activate_connection_link (objectlink *ol, bool state, object *source = 0)
+activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
 {
   for (; ol; ol = ol->next)
     {
       if (!ol->ob)
         {
                                : 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;
             SET_ANIMATION (tmp, tmp->value);
             update_object (tmp, UP_OBJ_FACE);
             break;
           case MOOD_FLOOR:
-            do_mood_floor (tmp, source);
+            do_mood_floor (tmp, activator);
             break;
           case TIMED_GATE:
             if (!tmp->active)
               tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
           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:
           case DUPLICATOR:
             move_duplicator (tmp);
             break;
           case MAPSCRIPT:
-            cfperl_mapscript_activate (tmp, source, state);
+            cfperl_mapscript_activate (tmp, state, activator, originator);
             break;
         }
     }
 }
  * Changed the routine to loop through _all_ objects.
  * Better hurry with that linked list...
  *
  */
 void
-push_button (object *op)
+push_button (object *op, object *originator)
 {
   if (oblinkpt *obp = op->find_link ())
     {
-      if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value)))
+      if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
         return;
-      activate_connection_link (obp->link, op->value, op);
+      activate_connection_link (obp->link, op->value, op, originator);
     }
 }
 /*
  * elmex:
  * 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 *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))
-    activate_connection_link (obp->link, state, originator);
+    activate_connection_link (obp->link, state, activator, originator);
 }
 /*
  * Updates everything connected with the button op.
  * After changing the state of a button, this function must be called
  * to make sure that all gates and other buttons connected to the
  * button reacts to the (eventual) change of state.
  */
 void
-update_button (object *op)
+update_button (object *op, object *originator)
 {
   int any_down = 0, old_value = op->value;
   if (oblinkpt *obp = op->find_link ())
     for (objectlink *ol = obp->link; ol; ol = ol->next)
             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;
           }
       }
   /* If this button hasn't changed, don't do anything */
   if (op->value != old_value)
     {
       SET_ANIMATION (op, op->value);
       update_object (op, UP_OBJ_FACE);
-      push_button (op);         /* Make all other buttons the same */
+      push_button (op, originator);         /* Make all other buttons the same */
     }
 }
 void
-use_trigger (object *op)
+use_trigger (object *op, object *originator)
 {
   /* Toggle value */
   op->value = !op->value;
-  push_button (op);
+  push_button (op, originator);
 }
 /*
  * Note: animate_object should be used instead of this,
  * but it can't handle animations in the 8 directions
  * 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.
    */
     new_info_map (NDI_BLACK, altar->map, altar->msg);
   return 1;
 }
-void
+static void
-trigger_move (object *op, int state)    /* 1 down and 0 up */
+trigger_move (object *op, int state, object *originator)    /* 1 down and 0 up */
 {
   op->stats.wc = state;
   if (state)
     {
-      use_trigger (op);
+      use_trigger (op, originator);
       op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
       op->speed_left = -1;
     }
   else
     {
-      use_trigger (op);
+      use_trigger (op, originator);
       op->set_speed (0);
     }
 }
  * 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 (in_movement || !push)
                   return 0;
               }
-            trigger_move (op, push);
+            trigger_move (op, push, cause);
           }
         return 0;
       case TRIGGER_PEDESTAL:
             if (in_movement || !push)
               return 0;
           }
-        trigger_move (op, push);
+        trigger_move (op, push, cause);
         return 0;
       case TRIGGER_ALTAR:
         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);
                   }
                 if (op->last_sp >= 0)
                   {
-                    trigger_move (op, 1);
+                    trigger_move (op, 1, cause);
                     if (op->last_sp > 0)
                       op->last_sp = -op->last_sp;
                   }
                 else
                   {
                     /* for trigger altar with last_sp, the ON/OFF
                      * status (-> +/- value) is "simulated":
                      */
                     op->value = !op->value;
-                    trigger_move (op, 1);
+                    trigger_move (op, 1, cause);
                     op->last_sp = -op->last_sp;
                     op->value = !op->value;
                   }
                 return cause == NULL;
              * it will push the connected value only once per sacrifice.
              * Otherwise (default), the connected value will be
              * pushed twice: First by sacrifice, second by reset! -AV
              */
             if (!op->last_sp)
-              trigger_move (op, 0);
+              trigger_move (op, 0, cause);
             else
               {
                 op->stats.wc = 0;
                 op->value = !op->value;
                 op->set_speed (0);
           {
             SET_ANIMATION (op, push);
             update_object (op, UP_OBJ_FACE);
           }
-        trigger_move (op, push);
+        trigger_move (op, push, cause);
         return 1;
       default:
         LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
         return 0;
             continue;
           }
         if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
           {
-            update_button (ol->ob);
+            update_button (ol->ob, 0);
             break;
           }
       }
 }
     {
       if (trig->last_heal)
         match->decrease ();
       trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
-      push_button (trig);
+      push_button (trig, op);
     }
   else if (!match && !trig->last_sp) // match == not having
     {
       trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
-      push_button (trig);
+      push_button (trig, op);
     }
 }

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.51 by root, Thu Jan 8 03:03:23 2009 UTC vs. Revision 1.61 by root, Fri Nov 6 13:03:34 2009 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.51 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.61 by root, Fri Nov 6 13:03:34 2009 UTC