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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.60 by root, Mon Oct 26 03:43:22 2009 UTC vs.
Revision 1.73 by root, Sun Jan 29 02:47:04 2017 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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 it under
  * the terms of the Affero 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.
  *
  * You should have received a copy of the Affero GNU General Public License
  * 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:
               }
             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);
         object *tmp = ol->ob;
         if (tmp->type == BUTTON)
           {
-            sint32 total = 0;
+            weight_t total = 0;
             for (object *ab = tmp->above; ab; ab = ab->above)
               /* Basically, if the move_type matches that on what the
                * button wants, we count it. The second check is so that
                * objects who don't move (swords, etc) will count. Note that
  *
  * 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)
                       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, cause);
                     op->last_sp = -op->last_sp;
                     op->value = !op->value;
               }
             /* If trigger_altar has "last_sp > 0" set on the map,
              * 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, cause);
             else
               {
           return obp;
   return 0;
 }
 /* This routine makes monsters who are
  * standing on the 'mood floor' change their
  * disposition if it is different.
  * If floor is to be triggered must have
  * a speed of zero (default is 1 for all
  * but the charm floor type).
  * by b.t. thomas@nomad.astro.psu.edu
  */
     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])
         return tmp;
     }
   return NULL;
 }
 /* check_inv(), a function to search the inventory,
  * of a player and then based on a set of conditions,
  * the square will activate connected items.
  * Monsters can't trigger this square (for now)
  * Values are:	last_sp = 1/0 obj/no obj triggers
  * 		last_heal = 1/0  remove/dont remove obj if triggered
  * -b.t. (thomas@nomad.astro.psu.edu
  *
  * Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op
  * because the check-inventory semantic essentially only applies when
  * something is above the inventory checker.
  * The semantic prior this change was: trigger if something has moved on or off
  *    away, and then leaves the inventory checker. That would've caused an always-enabled
  *    state in the inventory checker. This won't happen anymore now.
  *
  * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check
  * whether op is on this mapspace or not, because the value (1|0) depends
  * on this information. also make sure to only push_button if op has
  * a matching item (because when we do a push_button with value=0 timed gates
  * will still open)! (i hope i got the semantics right this time)
  *
  */
 void

Diff Legend

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

Comparing deliantra/server/common/button.C (file contents): Revision 1.60 by root, Mon Oct 26 03:43:22 2009 UTC vs. Revision 1.73 by root, Sun Jan 29 02:47:04 2017 UTC

Diff Legend

Comparing deliantra/server/common/button.C (file contents):
Revision 1.60 by root, Mon Oct 26 03:43:22 2009 UTC vs.
Revision 1.73 by root, Sun Jan 29 02:47:04 2017 UTC