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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.102 by root, Mon Jan 1 17:34:11 2007 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC

 /*
     CrossFire, A Multiplayer game for X-windows
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 int nrofallocobjects = 0;
 static UUID uuid;
 const uint64 UUID_SKIP = 1<<19;
-object *active_objects;         /* List of active objects that need to be processed */
+objectvec objects;
+activevec actives;
 short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
   0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
 };
 short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
 }
 /*
  * Returns the object which has the count-variable equal to the argument.
  */
 object *
 find_object (tag_t i)
 {
-  for (object *op = object::first; op; op = op->next)
+  return ((unsigned int)i) < objects.size ()
-    if (op->count == i)
+    ? objects [i]
-      return op;
+    : 0;
-  return 0;
 }
 /*
  * Returns the first object which has a name equal to the argument.
  * Used only by the patch command, but not all that useful.
  * Enables features like "patch <name-of-other-player> food 999"
  */
 object *
 find_object_name (const char *str)
 {
   shstr_cmp str_ (str);
   object *op;
-  for (op = object::first; op != NULL; op = op->next)
+  for_all_objects (op)
     if (op->name == str_)
       break;
   return op;
 }
   free_key_values (this);
 }
 void object::link ()
 {
-  count = ++ob_count;
   uuid = gen_uuid ();
-  prev = 0;
+  refcnt_inc ();
-  next = object::first;
+  objects.insert (this);
-  if (object::first)
-    object::first->prev = this;
-  object::first = this;
 }
 void object::unlink ()
 {
-  if (this == object::first)
+  objects.erase (this);
-    object::first = next;
+  refcnt_dec ();
-  /* Remove this object from the list of used objects */
-  if (prev) prev->next = next;
-  if (next) next->prev = prev;
-  prev = 0;
-  next = 0;
-}
-bool
-object::active () const
-{
-  return active_next || active_prev || this == active_objects;
 }
 void
 object::activate ()
 {
   /* If already on active list, don't do anything */
-  if (active ())
+  if (active)
     return;
   if (has_active_speed ())
-    {
+    actives.insert (this);
-      /* process_events() expects us to insert the object at the beginning
-       * of the list. */
-      active_next = active_objects;
-      if (active_next)
-        active_next->active_prev = this;
-      active_objects = this;
-    }
 }
 void
 object::activate_recursive ()
 {
   activate ();
-  for (object *op = inv; op; op = op->above)
+  for (object *op = inv; op; op = op->below)
     op->activate_recursive ();
 }
 /* This function removes object 'op' from the list of active
  * objects.
  */
 void
 object::deactivate ()
 {
   /* If not on the active list, nothing needs to be done */
-  if (!active ())
+  if (!active)
     return;
-  if (active_prev == 0)
+  actives.erase (this);
-    {
-      active_objects = active_next;
-      if (active_next)
-        active_next->active_prev = 0;
-    }
-  else
-    {
-      active_prev->active_next = active_next;
-      if (active_next)
-        active_next->active_prev = active_prev;
-    }
-  active_next = 0;
-  active_prev = 0;
 }
 void
 object::deactivate_recursive ()
 {
-  for (object *op = inv; op; op = op->above)
+  for (object *op = inv; op; op = op->below)
     op->deactivate_recursive ();
   deactivate ();
+}
+void
+object::set_flag_inv (int flag, int value)
+{
+  for (object *op = inv; op; op = op->below)
+    {
+      op->flag [flag] = value;
+      op->set_flag_inv (flag, value);
+    }
 }
 /*
  * Remove and free all objects in the inventory of the given object.
  * object.c ?
           if (op->flag [FLAG_STARTEQUIP]
               || op->flag [FLAG_NO_DROP]
               || op->type == RUNE
               || op->type == TRAP
-              || op->flag [FLAG_IS_A_TEMPLATE])
+              || op->flag [FLAG_IS_A_TEMPLATE]
+              || op->flag [FLAG_DESTROY_ON_DEATH])
             op->destroy ();
           else
             map->insert (op, x, y);
         }
     }
         freed_map->name   = "/internal/freed_objects_map";
         freed_map->width  = 3;
         freed_map->height = 3;
         freed_map->alloc ();
+        freed_map->in_memory = MAP_IN_MEMORY;
       }
     map = freed_map;
     x = 1;
     y = 1;
   // clear those pointers that likely might have circular references to us
   owner       = 0;
   enemy       = 0;
   attacked_by = 0;
-  // only relevant for players(?), but make sure of it anyways
-  contr       = 0;
 }
 void
 object::destroy (bool destroy_inventory)
 {
     {
       /* The part may be on a different map. */
       object *more = op->more;
-      /* We really need the caller to normalize coordinates - if
+      /* We really need the caller to normalise coordinates - if
        * we set the map, that doesn't work if the location is within
        * a map and this is straddling an edge.  So only if coordinate
-       * is clear wrong do we normalize it.
+       * is clear wrong do we normalise it.
        */
       if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
         more->map = get_map_from_coord (m, &more->x, &more->y);
       else if (!more->map)
         {
 {
   object *tmp, *tmp1;
   /* first search for itself and remove any old instances */
-  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
     if (!strcmp (tmp->arch->name, arch_string))       /* same archetype */
       tmp->destroy ();
   tmp1 = arch_to_object (archetype::find (arch_string));
   /* The objects have to be checked from top to bottom.
    * Hence, we first go to the top:
    */
-  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
+  for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
     {
       /* Trim the search when we find the first other spell effect
        * this helps performance so that if a space has 50 spell objects,
        * we don't need to check all of them.
        */
  * The first matching object is returned, or NULL if none.
  */
 object *
 present_arch (const archetype *at, maptile *m, int x, int y)
 {
-  if (m == NULL || out_of_map (m, x, y))
+  if (!m || out_of_map (m, x, y))
     {
       LOG (llevError, "Present_arch called outside map.\n");
       return NULL;
     }
-  for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
+  for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
     if (tmp->arch == at)
       return tmp;
   return NULL;
 }
     {
       LOG (llevError, "Present called outside map.\n");
       return NULL;
     }
-  for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
+  for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
     if (tmp->type == type)
       return tmp;
   return NULL;
 }

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.102 by root, Mon Jan 1 17:34:11 2007 UTC vs. Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.102 by root, Mon Jan 1 17:34:11 2007 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC