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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.80 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.95 by root, Mon Oct 26 11:31:39 2009 UTC

  *
  * Copyright (©) 2005,2006,2007,2008 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>
  */
 /*
       tmp->map = op->map;
       tmp->level = op->level;
       insert_ob_in_map (tmp, op->map, op, 0);
     }
-  op->destroy_inv (true); // be explicit about dropping
+  op->drop_and_destroy ();
-  op->destroy (true);
 }
 void
 remove_door2 (object *op)
 {
       tmp->map = op->map;
       tmp->level = op->level;
       insert_ob_in_map (tmp, op->map, op, 0);
     }
-  op->destroy_inv (true); // be explicit about dropping
+  op->drop_and_destroy ();
-  op->destroy (true);
 }
 void
 generate_monster (object *gen)
 {
   if (!gen->map)
     return;
   if (GENERATE_SPEED (gen) && rndm (0, GENERATE_SPEED (gen) - 1))
+    return;
+  // sleeping generators won't generate, this will make monsters like
+  // centipedes not generate more centipedes when being asleep.
+  if (gen->flag [FLAG_SLEEP])
     return;
   object *op;
   int dir;
         create_treasure (op->randomitems, op, GT_APPLY, gen->map->difficulty);
       return;
     }
-  op->destroy (true);
+  op->destroy ();
 }
 void
 remove_force (object *op)
 {
           CLEAR_FLAG (op, FLAG_APPLIED);
           change_abil (op->env, op);
           op->env->update_stats ();
       }
-  op->destroy (true);
+  op->destroy ();
 }
 void
 remove_blindness (object *op)
 {
     {
       change_abil (op->env, op);
       op->env->update_stats ();
     }
-  op->destroy (true);
+  op->destroy ();
 }
 void
 poison_more (object *op)
 {
   if (op->env == NULL || !QUERY_FLAG (op->env, FLAG_ALIVE) || op->env->stats.hp < 0)
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   if (op->stats.food == 1)
     {
           CLEAR_FLAG (op, FLAG_APPLIED);
           op->env->update_stats ();
           new_draw_info (NDI_UNIQUE, 0, op->env, "You feel much better now.");
         }
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   if (op->env->type == PLAYER)
     {
   if (op->stats.sp == 1)
     {
       if (detected && last == 0)
         {
           op->value = 1;
-          push_button (op);
+          push_button (op, tmp);
         }
       if (!detected && last == 1)
         {
           op->value = 0;
-          push_button (op);
+          push_button (op, tmp);
         }
     }
   else
     {                           /* in this case, we unset buttons */
       if (detected && last == 1)
         {
           op->value = 0;
-          push_button (op);
+          push_button (op, tmp);
         }
       if (!detected && last == 0)
         {
           op->value = 1;
-          push_button (op);
+          push_button (op, tmp);
         }
     }
 }
 void
           if (payload == NULL)
             return NULL;
           payload->remove ();
-          op->destroy (true);
+          op->destroy ();
           return payload;
         }
       case ARROW:
         if (op->has_active_speed ())
 fix_stopped_arrow (object *op)
 {
   if (rndm (0, 99) < op->stats.food)
     {
       /* Small chance of breaking */
-      op->destroy (true);
+      op->destroy ();
       return NULL;
     }
   op->set_speed (0);
   op->direction = 0;
   // restore original wc, dam, attacktype and slaying
   op->stats.wc   = op->stats.sp;
   op->stats.dam  = op->stats.hp;
   op->attacktype = op->stats.grace;
+  op->slaying    = op->custom_name;
-  if (op->spellarg)
-    {
-      op->slaying = op->spellarg;
-      free (op->spellarg);
-      op->spellarg = 0;
-    }
-  else
-    op->slaying = 0;
-  /* Reset these to zero, so that object::can_merge will work properly */
+  /* Reset these to defaults, so that object::can_merge will work properly */
-  op->spellarg = NULL;
+  op->custom_name = 0;
-  op->stats.sp = 0;
+  op->stats.sp    = 0;
-  op->stats.hp = 0;
+  op->stats.hp    = 0;
   op->stats.grace = 0;
-  op->level = 0;
+  op->level       = 0;
-  op->face = op->arch->face;
+  op->face        = op->arch->face;
-  op->owner = NULL;             /* So that stopped arrows will be saved */
+  op->owner       = 0;
   update_object (op, UP_OBJ_CHANGE);
   return op;
 }
 /* stop_arrow() - what to do when a non-living flying object
  * has to stop. Sept 96 - I added in thrown object code in
       // replace this by straightforward drop to ground?
       object *payload = op->inv;
       payload->owner = 0;
       insert_ob_in_map (payload, op->map, payload, 0);
-      op->destroy (true);
+      op->destroy ();
     }
   else
     {
       op = fix_stopped_arrow (op);
   int was_reflected;
   if (!op->map)
     {
       LOG (llevError, "BUG: Arrow had no map.\n");
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   /* we need to stop thrown objects at some point. Like here. */
   if (op->type == THROWN_OBJ)
        * bomb code, but there are potential other cases where that could happen,
        * and it is easy enough to clean it up here.
        */
       if (!op->inv)
         {
-          op->destroy (true);
+          op->destroy ();
           return;
         }
       if (op->last_sp-- < 0)
         {
               return;
             }
           /* update object image for new facing */
           /* many thrown objects *don't* have more than one face */
-          if (GET_ANIM_ID (op))
+          if (op->has_anim ())
-            SET_ANIMATION (op, op->direction);
+            op->set_anim_frame (op->direction);
         }                       /* object is reflected */
     }                           /* object ran into a wall */
   /* decrease the speed as it flies. 0.05 means a standard bow will shoot
    * about 17 squares. Tune as needed.
   op->remove ();
   for (i = 0; i < op->stats.food; i++)
     {
       object *tmp = arch_to_object (op->other_arch);
-      if (op->type == LAMP)
-        tmp->stats.food = op->stats.food - 1;
       tmp->stats.hp = op->stats.hp;     /* The only variable it keeps. */
       if (env)
         env->insert (tmp);
       else
         {
           j = find_first_free_spot (tmp, op->map, op->x, op->y);
           if (j < 0)          /* No free spot */
-            tmp->destroy (true);
+            tmp->destroy ();
           else
             {
               mapxy pos (op); pos.move (j);
               if (pos.normalise ())
                 pos.insert (tmp, op);
             }
         }
     }
-  op->destroy (true);
+  op->destroy ();
 }
 void
 move_teleporter (object *op)
 {
   else if (EXIT_X (head) || EXIT_Y (head))
     {
       if (out_of_map (head->map, EXIT_X (head), EXIT_Y (head)))
         {
           LOG (llevError, "Removed illegal teleporter.\n");
-          head->destroy (true);
+          head->destroy ();
           return;
         }
       if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
         return;
   for (tmp = op->above; tmp; tmp = tmp->above)
     {
       if (op->other_arch->archname == tmp->arch->archname)
         {
           if (op->level <= 0)
-            tmp->destroy (true);
+            tmp->destroy ();
           else
             {
               uint64 new_nrof = (uint64) tmp->nrof * op->level;
               if (new_nrof >= 1UL << 31)
     {
       creator->stats.hp = -1;
       return;
     }
-  if (creator->inv != NULL)
+  if (creator->inv)
     {
       object *ob;
       int i;
       object *ob_to_copy;
     }
   /* Make sure this multipart object fits */
   if (new_ob->arch->more && new_ob->blocked (creator->map, creator->x, creator->y))
     {
-      op->destroy_inv (false); // remove when desttroy does this
-      new_ob->destroy (true);
+      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
 {
   if (object *tmp = op->ms ().player ())
     {
       /* remove an old force with a slaying field == op->name */
       if (object *force = tmp->force_find (op->name))
-        force->destroy (true);
+        force->destroy ();
-      if (!tmp->force_find (op->slaying))
+      if (op->slaying && !tmp->force_find (op->slaying))
         {
           tmp->force_add (op->slaying, op->stats.food);
           if (op->msg)
             new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, tmp, op->msg);
               op->stats.hp--;
               if (op->stats.hp == 0)
                 {
                   /* marker expires--granted mark number limit */
-                  op->destroy (true);
+                  op->destroy ();
                   return;
                 }
             }
         }
     }
+}
+// mapscript objects activate themselves (only) then their timer fires
+// TODO: maybe they should simply trigger the link like any other object?
+void
+move_mapscript (object *op)
+{
+  op->set_speed (0);
+  cfperl_mapscript_activate (op, true, op, 0);
+}
+void move_lamp (object *op)
+{
+  // if the lamp/torch is off, we should disable it.
+  if (!op->glow_radius)
+    {
+      op->set_speed (0);
+      return;
+    }
+  else
+    {
+      // check whether the face might need to be updated
+      // (currently this is needed to have already switched on torches
+      // on maps, as they just set the glow_radius in the archetype)
+      if (op->other_arch
+          && (
+            (op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE])
+            || (op->flag [FLAG_ANIMATE]
+                  ? (op->animation_id != op->other_arch->animation_id)
+                  : (op->face         != op->other_arch->face))
+          ))
+        get_animation_from_arch (op, op->other_arch);
+    }
+  // lamps and torches on maps don't use up their fuel
+  if (op->is_on_map ())
+    return;
+  if (op->stats.food > 0)
+    {
+      op->stats.food--;
+      return;
+    }
+  apply_lamp (op, false);
 }
 void
 process_object (object *op)
 {
               op->remove (); // TODO: really necessary?
               if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
                 make_sure_not_seen (op);
-              op->destroy_inv (false); // be explicit about dropping
-              op->destroy (true);
+              op->drop_and_destroy ();
             }
           return;
         }
     }
       case PLAYER:
         // players have their own speed-management, so undo the --speed_left
         ++op->speed_left;
         break;
-    }
-}
+      case MAPSCRIPT:
+        move_mapscript (op);
+        break;
+      case LAMP:
+      case TORCH:
+        move_lamp (op);
+        break;
+    }
+}

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.80 by root, Mon Sep 29 10:20:49 2008 UTC vs. Revision 1.95 by root, Mon Oct 26 11:31:39 2009 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.80 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.95 by root, Mon Oct 26 11:31:39 2009 UTC