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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.72 by root, Thu Nov 8 19:43:29 2007 UTC vs.
Revision 1.84 by root, Thu Jan 8 04:35:05 2009 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 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
  * it under the terms of the GNU General Public License as published by
       tmp->map = op->map;
       tmp->level = op->level;
       insert_ob_in_map (tmp, op->map, op, 0);
     }
-  op->destroy ();
+  op->drop_and_destroy ();
 }
 void
 remove_door2 (object *op)
 {
       tmp->map = op->map;
       tmp->level = op->level;
       insert_ob_in_map (tmp, op->map, op, 0);
     }
-  op->destroy ();
+  op->drop_and_destroy ();
 }
 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;
       dir = find_free_spot (op, gen->map, gen->x, gen->y, 1, SIZEOFFREE1 + 1);
       if (dir < 0)
         return;
-      op = object_create_clone (op);
+      op = op->deep_clone ();
       CLEAR_FLAG (op, FLAG_IS_A_TEMPLATE);
       unflag_inv (op, FLAG_IS_A_TEMPLATE);
     }
   else if (gen->other_arch)
   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
 }
 void
 move_hole (object *op)
 {                               /* 1 = opening, 0 = closing */
-  object *next, *tmp;
   if (op->value)
     {                           /* We're opening */
       if (--op->stats.wc <= 0)
         {                       /* Opened, let's stop */
           op->stats.wc = 0;
           op->set_speed (0);
           /* Hard coding this makes sense for holes I suppose */
           op->move_on = MOVE_WALK;
-          for (tmp = op->above; tmp != NULL; tmp = next)
+          for (object *next, *tmp = op->above; tmp; tmp = next)
             {
               next = tmp->above;
               move_apply (op, tmp, tmp);
             }
         }
         {
           object *payload = op->inv;
           if (payload == NULL)
             return NULL;
           payload->remove ();
           op->destroy ();
           return payload;
         }
   if (INVOKE_OBJECT (STOP, op))
     return;
   if (op->inv)
     {
+      // replace this by straightforward drop to ground?
       object *payload = op->inv;
-      payload->remove ();
       payload->owner = 0;
       insert_ob_in_map (payload, op->map, payload, 0);
       op->destroy ();
     }
   else
        * is if the player throws a bomb - the bomb explodes on its own,
        * but this object sticks around.  We could handle the cleanup in the
        * 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 == NULL)
+      if (!op->inv)
         {
           op->destroy ();
           return;
         }
       if (op->type == LAMP)
         tmp->stats.food = op->stats.food - 1;
       tmp->stats.hp = op->stats.hp;     /* The only variable it keeps. */
       if (env)
-        {
-          tmp = env->insert (tmp);
+        env->insert (tmp);
-          /* If this object is the players inventory, we need to tell the
-           * client of the change.  Insert_ob_in_map takes care of the
-           * updating the client, so we don't need to do that below.
-           */
-          if (object *pl = op->in_player ())
-            {
-              esrv_del_item (pl->contr, op->count);
-              esrv_send_item (pl, tmp);
-            }
-        }
       else
         {
           j = find_first_free_spot (tmp, op->map, op->x, op->y);
           if (j < 0)          /* No free spot */
             tmp->destroy ();
   else
     {
       /* Random teleporter */
       if (INVOKE_OBJECT (TRIGGER, op, ARG_OBJECT (tmp)))
         return;
       teleport (head, TELEPORTER, tmp);
     }
 }
 /*  This object will teleport someone to a different map
     {
       creator->stats.hp = -1;
       return;
     }
-  if (creator->inv != NULL)
+  if (creator->inv)
     {
       object *ob;
       int i;
       object *ob_to_copy;
           if (rndm (0, i) == 0)
             {
               ob_to_copy = ob;
             }
         }
-      new_ob = object_create_clone (ob_to_copy);
+      new_ob = ob_to_copy->deep_clone ();
       CLEAR_FLAG (new_ob, FLAG_IS_A_TEMPLATE);
       unflag_inv (new_ob, FLAG_IS_A_TEMPLATE);
     }
   else
     {
-      if (creator->other_arch == NULL)
+      if (!creator->other_arch)
         {
           LOG (llevError, "move_creator: Creator doesn't have other arch set: %s (%s, %d, %d)\n",
                &creator->name, &creator->map->path, creator->x, creator->y);
           return;
         }
   insert_ob_in_map_at (new_ob, creator->map, creator, 0, creator->x, creator->y);
   if (QUERY_FLAG (new_ob, FLAG_FREED))
     return;
   if (creator->slaying)
-    {
-      new_ob->name = new_ob->title = creator->slaying;
+    new_ob->name = new_ob->title = creator->slaying;
-    }
 }
 /* move_marker --peterm@soda.csua.berkeley.edu
    when moved, a marker will search for a player sitting above
    it, and insert an invisible, weightless force into him
             }
         }
     }
 }
+// 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
 process_object (object *op)
 {
   if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
     return;
         {
           if (QUERY_FLAG (op, FLAG_APPLIED))
             remove_force (op);
           else
             {
-              /* If necessary, delete the item from the players inventory */
+              op->remove (); // TODO: really necessary?
-              if (object *pl = op->in_player ())
-                esrv_del_item (pl->contr, op->count);
-              op->remove ();
               if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
                 make_sure_not_seen (op);
-              op->destroy ();
+              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;
+    }
+}

Diff Legend

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

Comparing deliantra/server/server/time.C (file contents): Revision 1.72 by root, Thu Nov 8 19:43:29 2007 UTC vs. Revision 1.84 by root, Thu Jan 8 04:35:05 2009 UTC

Diff Legend

Comparing deliantra/server/server/time.C (file contents):
Revision 1.72 by root, Thu Nov 8 19:43:29 2007 UTC vs.
Revision 1.84 by root, Thu Jan 8 04:35:05 2009 UTC