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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.51 by root, Fri May 18 20:45:37 2007 UTC vs.
Revision 1.65 by root, Mon Aug 27 05:40:57 2007 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * 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
+ * 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 this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /*
  * Routines that is executed from objects based on their speed have been
  * collected in this file.
   if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))
     return;
   object *op;
+  int i;
   if (QUERY_FLAG (gen, FLAG_CONTENT_ON_GEN))
     {
-      // either copy one item form the inventory...
+      // either copy one item from the inventory...
       if (!gen->inv)
         return;
       // first select one item from the inventory
       int index = 0;
       for (object *tmp = gen->inv; tmp; tmp = tmp->below)
         if (!rndm (++index))
           op = tmp;
+      i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9);
+      if (i < 0)
+        return;
       op = object_create_clone (op);
       CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE);
       unflag_inv (op, FLAG_IS_A_TEMPLATE);
     }
+  else if (gen->other_arch)
+    {
+      // ...or use other_arch
+      i = find_free_spot (gen->other_arch, gen->map, gen->x, gen->y, 1, 9);
+      if (i < 0)
+        return;
+      op = arch_to_object (gen->other_arch);
+    }
   else
-    {
-      // ...or use other_arch
-      if (archetype *at = gen->other_arch)
-        op = arch_to_object (at);
-      else
-        return;
+    return;
-    }
   op->expand_tail ();
-  int i = find_free_spot (op, gen->map, gen->x, gen->y, 1, 9);
-  if (i >= 0)
-    {
-      if (insert_ob_in_map_at (op, gen->map, gen, 0, gen->x + freearr_x[i], gen->y + freearr_y[i]))
+  if (insert_ob_in_map_at (op, gen->map, gen, 0, gen->x + freearr_x[i], gen->y + freearr_y[i]))
-        {
+    {
-          if (rndm (0, 9))
+      if (rndm (0, 9))
-            generate_artifact (op, gen->map->difficulty);
+        generate_artifact (op, gen->map->difficulty);
-          if (op->has_random_items ())
+      if (op->has_random_items ())
-            create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty);
+        create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty);
-          return;
+      return;
-        }
     }
   op->destroy ();
 }
   if (op->value)
     {
       if (--op->stats.wc <= 0)
         {                       /* Reached bottom, let's stop */
           op->stats.wc = 0;
-          if (op->arch->clone.speed)
+          if (op->arch->speed)
             op->value = 0;
           else
             op->set_speed (0);
         }
        * objects are above the gate.  If so, we finish closing the gate,
        * otherwise, we fall through to the code below which should lower
        * the gate slightly.
        */
-      for (tmp = op->above; tmp != NULL; tmp = tmp->above)
+      for (tmp = op->above; tmp; tmp = tmp->above)
         if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))
           break;
-      if (tmp == NULL)
+      if (!tmp)
         {
-          if (op->arch->clone.speed)
+          if (op->arch->speed)
             op->value = 1;
           else
             op->set_speed (0);
           return;
           if (tmp)
             {
               if (QUERY_FLAG (tmp, FLAG_ALIVE))
                 {
                   hit_player (tmp, random_roll (0, op->stats.dam, tmp, PREFER_LOW), op, AT_PHYSICAL, 1);
+                  op->play_sound (sound_find ("blocked_gate"));
                   if (tmp->type == PLAYER)
                     new_draw_info_format (NDI_UNIQUE, 0, tmp, "You are crushed by the %s!", &op->name);
                 }
-              else
                 /* If the object is not alive, and the object either can
                  * be picked up or the object rolls, move the object
                  * off the gate.
                  */
-              if (!QUERY_FLAG (tmp, FLAG_ALIVE) && (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL)))
+              else if (!QUERY_FLAG (tmp, FLAG_ALIVE) && (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL)))
                 {
                   /* If it has speed, it should move itself, otherwise: */
                   int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
                   /* If there is a free spot, move the object someplace */
                     }
                 }
             }
           /* See if there is still anything blocking the gate */
-          for (tmp = op->above; tmp != NULL; tmp = tmp->above)
+          for (tmp = op->above; tmp; tmp = tmp->above)
             if (!QUERY_FLAG (tmp, FLAG_NO_PICK) || QUERY_FLAG (tmp, FLAG_CAN_ROLL) || QUERY_FLAG (tmp, FLAG_ALIVE))
               break;
           /* IF there is, start putting the gate down  */
           if (tmp)
-            {
-              op->stats.food = 1;
+            op->stats.food = 1;
-            }
           else
             {
               op->move_block = MOVE_ALL;
-              if (!op->arch->clone.stats.ac)
+              if (!op->arch->stats.ac)
                 SET_FLAG (op, FLAG_BLOCKSVIEW);
               update_all_los (op->map, op->x, op->y);
             }
         }                       /* gate is halfway up */
   int v = op->value;
   if (op->stats.sp)
     {
       move_gate (op);
       if (op->value != v)       /* change direction ? */
         op->stats.sp = 0;
       return;
     }
   if (--op->stats.hp <= 0)
     {                           /* keep gate down */
       move_gate (op);
       if (op->value != v)
         op->set_speed (0);
     }
 }
   int last = op->value;
   int detected;
   detected = 0;
-  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && !detected; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && !detected; tmp = tmp->above)
     {
       object *tmp2;
       if (op->stats.hp)
         {
       if (detected && last == 0)
         {
           op->value = 1;
           push_button (op);
         }
       if (!detected && last == 1)
         {
           op->value = 0;
           push_button (op);
         }
       if (detected && last == 1)
         {
           op->value = 0;
           push_button (op);
         }
       if (!detected && last == 0)
         {
           op->value = 1;
           push_button (op);
         }
   op->spellarg = NULL;
   op->stats.sp = 0;
   op->stats.hp = 0;
   op->stats.grace = 0;
   op->level = 0;
-  op->face = op->arch->clone.face;
+  op->face = op->arch->face;
   op->owner = NULL;             /* So that stopped arrows will be saved */
   update_object (op, UP_OBJ_CHANGE);
   return op;
 }
     move_teleporter (op->more);
   if (op->head)
     head = op->head;
-  for (tmp = op->above; tmp != NULL; tmp = tmp->above)
+  for (tmp = op->above; tmp; tmp = tmp->above)
     if (!QUERY_FLAG (tmp, FLAG_IS_FLOOR))
       break;
   /* If nothing above us to move, nothing to do */
   if (!tmp || QUERY_FLAG (tmp, FLAG_WIZPASS))
       if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
         return;
       teleport (head, TELEPORTER, tmp);
     }
 }
 /*  This object will teleport someone to a different map
     and will also apply changes to the player from its inventory.
     This was invented for giving classes, but there's no reason it
     can't be generalized.
     return;                     /* dm has created a firewall in his inventory */
   spell = op->inv;
   if (!spell || spell->type != SPELL)
-    spell = &op->other_arch->clone;
+    spell = op->other_arch;
   if (!spell)
     {
       LOG (llevError, "move_firewall: no spell specified (%s, %s, %d, %d)\n", &op->name, &op->map->name, op->x, op->y);
       return;
                    * is cleared, otherwise the player will get stuck in
                    * place.  This can happen if the player used a spell to
                    * get to this space.
                    */
                   victim->contr->fire_on = 0;
-                  victim->speed_left = 0.f;
+                  victim->speed_left = 1.f;
                   move_player (victim, dir);
                 }
               else
                 return;
             }
   if (op->above == NULL)
     return;
   for (tmp = op->above; tmp; tmp = tmp->above)
     {
-      if (op->other_arch->name == tmp->arch->name)
+      if (op->other_arch->archname == tmp->arch->archname)
         {
           if (op->level <= 0)
             tmp->destroy ();
           else
             {
  * has to make sure that there is in fact space for the object.
  * It should really do this for small objects also, but there is
  * more concern with large objects, most notably a part being placed
  * outside of the map which would cause the server to crash
 */
 void
 move_creator (object *creator)
 {
   object *new_ob;
   if (new_ob->arch->more && ob_blocked (new_ob, creator->map, creator->x, creator->y))
     {
       new_ob->destroy ();
       return;
     }
+  // for now lets try to identify everything generated here, it mostly
+  // happens automated, so this will at least fix many identify-experience holes
+  SET_FLAG (new_ob, FLAG_IDENTIFIED);
   insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
   if (QUERY_FLAG (new_ob, FLAG_FREED))
     return;
 void
 move_marker (object *op)
 {
   if (object *tmp = op->ms ().player ())
     {
-      object *tmp2;
       /* remove an old force with a slaying field == op->name */
-      for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
+      if (object *force = tmp->force_find (op->name))
-        if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->name)
+        force->destroy ();
+      if (!tmp->force_find (op->slaying))
-          {
+        {
-            tmp2->destroy ();
+          tmp->force_add (op->slaying, op->stats.food);
-            break;
-          }
-      /* cycle through his inventory to look for the MARK we want to
-       * place
-       */
-      for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
-        if (tmp2->type == FORCE && tmp2->slaying && tmp2->slaying == op->slaying)
-          break;
-      /* if we didn't find our own MARK */
-      if (!tmp2)
-        {
-          object *force = get_archetype (FORCE_NAME);
-          if (op->stats.food)
-            {
-              force->set_speed (0.01);
-              force->speed_left = -op->stats.food;
-            }
-          else
-            force->set_speed (0);
-          /* put in the lock code */
-          force->slaying = op->slaying;
-          if (op->lore)
-            force->lore = op->lore;
-          insert_ob_in_ob (force, tmp);
           if (op->msg)
             new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);
           if (op->stats.hp > 0)
             {
               op->stats.hp--;
               if (op->stats.hp == 0)
                 {
                   /* marker expires--granted mark number limit */
                   op->destroy ();
                   return;
 }
 void
 process_object (object *op)
 {
-  if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
+  if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
     return;
-  if (INVOKE_OBJECT (TICK, op))
+  if (expect_false (INVOKE_OBJECT (TICK, op)))
     return;
   if (QUERY_FLAG (op, FLAG_MONSTER))
     if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
       return;
       if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
         make_sure_seen (op);
     }
+  if (expect_false (
-  if (op->flag [FLAG_GENERATOR]
+        op->flag [FLAG_GENERATOR]
-      || op->flag [FLAG_CHANGING]
+        || op->flag [FLAG_CHANGING]
-      || op->flag [FLAG_IS_USED_UP])
+        || op->flag [FLAG_IS_USED_UP]
+     ))
     {
       if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)
         {
           change_object (op);
           return;

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.51 by root, Fri May 18 20:45:37 2007 UTC vs. Revision 1.65 by root, Mon Aug 27 05:40:57 2007 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.51 by root, Fri May 18 20:45:37 2007 UTC vs.
Revision 1.65 by root, Mon Aug 27 05:40:57 2007 UTC