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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC

    * objects with lists are rare, and lists stay short. If not, use a
    * different structure or at least keep the lists sorted...
    */
   /* For each field in wants, */
-  for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)
+  for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
     {
       key_value *has_field;
       /* Look for a field in has with the same key. */
       has_field = get_ob_key_link (has, wants_field->key);
 {
   if (!op)
     return strdup ("[NULLOBJ]");
   object_freezer freezer;
-  save_object (freezer, op, 3);
+  save_object (freezer, op, 1);
   return freezer.as_string ();
 }
 /*
  * get_nearest_part(multi-object, object 2) returns the part of the
   extern int arch_init;
   /* No reason putting the archetypes objects on the speed list,
    * since they never really need to be updated.
    */
   if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
     {
       LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
-#ifdef MANY_CORES
-      abort ();
-#else
       op->speed = 0;
-#endif
     }
   if (arch_init)
     return;
    */
   if (!op->map || op->map->in_memory == MAP_SAVING)
     return;
   /* make sure the object is within map boundaries */
-  if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))
+  if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
     {
       LOG (llevError, "update_object() called for object out of map!\n");
 #ifdef MANY_CORES
       abort ();
 #endif
               dump = dump_object (GET_MAP_OB (map, x, y));
               LOG (llevError, "%s\n", dump);
               free (dump);
             }
-          map->at (x, y).bottom = above;      /* goes on above it. */
+          map->at (x, y).bot = above;      /* goes on above it. */
         }
       above = 0;
       below = 0;
       op->below = originator->below;
       if (op->below)
         op->below->above = op;
       else
-        op->ms ().bottom = op;
+        op->ms ().bot = op;
       /* since *below* originator, no need to update top */
       originator->below = op;
     }
   else
           if (op->above)
             op->above->below = op;
           op->below = NULL;
-          op->ms ().bottom = op;
+          op->ms ().bot = op;
         }
       else
         {                       /* get inserted into the stack above top */
           op->above = top->above;
    * be far away from this change and not affected in any way -
    * this should get redone to only look for players within range,
    * or just updating the P_NEED_UPDATE for spaces within this area
    * of effect may be sufficient.
    */
-  if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
+  if (op->map->darkness && (op->glow_radius != 0))
     update_all_los (op->map, op->x, op->y);
   /* updates flags (blocked, alive, no magic, etc) for this map space */
   update_object (op, UP_OBJ_INSERT);
   if ((op->glow_radius != 0) && map)
     {
 #ifdef DEBUG_LIGHTS
       LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
 #endif /* DEBUG_LIGHTS */
-      if (MAP_DARKNESS (map))
+      if (map->darkness)
         update_all_los (map, x, y);
     }
   /* Client has no idea of ordering so lets not bother ordering it here.
    * It sure simplifies this function...
   /* 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 != NULL && tmp->above != NULL; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (op->map, op->x, op->y); 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.
        */
 /*
  * present_arch(arch, map, x, y) searches for any objects with
  * a matching archetype at the given map and coordinates.
  * The first matching object is returned, or NULL if none.
  */
 object *
 present_arch (const archetype *at, maptile *m, int x, int y)
 {
-  object *
-    tmp;
   if (m == NULL || out_of_map (m, x, y))
     {
       LOG (llevError, "Present_arch called outside map.\n");
       return NULL;
     }
-  for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
+  for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
     if (tmp->arch == at)
       return tmp;
   return NULL;
 }
 /*
  * present(type, map, x, y) searches for any objects with
  * a matching type variable at the given map and coordinates.
  * The first matching object is returned, or NULL if none.
  */
 object *
 present (unsigned char type, maptile *m, int x, int y)
 {
-  object *
-    tmp;
   if (out_of_map (m, x, y))
     {
       LOG (llevError, "Present called outside map.\n");
       return NULL;
     }
-  for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
+  for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
     if (tmp->type == type)
       return tmp;
   return NULL;
 }
 /*
  * present_in_ob(type, object) searches for any objects with
  * a matching type variable in the inventory of the given object.
  * The first matching object is returned, or NULL if none.
  */
 object *
 present_in_ob (unsigned char type, const object *op)
 {
-  object *
-    tmp;
-  for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
     if (tmp->type == type)
       return tmp;
   return NULL;
 }
 /*
  * present_in_ob (type, str, object) searches for any objects with
  * to be unique.
  */
 object *
 present_in_ob_by_name (int type, const char *str, const object *op)
 {
-  object *tmp;
-  for (tmp = op->inv; tmp; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
     if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
       return tmp;
   return 0;
 }
           if ((move_type & blocked) == move_type)
             max = maxfree[i];
           else if (mflags & P_IS_ALIVE)
             {
-              for (tmp = ms.bottom; tmp; tmp = tmp->above)
+              for (tmp = ms.bot; tmp; tmp = tmp->above)
                 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
                     && (tmp != exclude || (tmp->head && tmp->head != exclude)))
                   break;
               if (tmp)

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.82 by root, Mon Dec 25 11:25:49 2006 UTC vs. Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.86 by root, Tue Dec 26 08:17:58 2006 UTC