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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.76 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.86 by root, Thu Feb 15 15:43:36 2007 UTC

  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * The authors can be reached via e-mail at <crossfire@schmorp.de>
  */
-#include <global.h>
-#include <funcpoint.h>
-#include <loader.h>
 #include <unistd.h>
+#include "global.h"
+#include "funcpoint.h"
+#include "loader.h"
 #include "path.h"
 /*
  * This makes a path absolute outside the world of Crossfire.
   char *endbuf;
   struct stat statbuf;
   int mode = 0;
   if (prepend_dir)
-    strcpy (buf, create_pathname (name));
+    assign (buf, create_pathname (name));
   else
-    strcpy (buf, name);
+    assign (buf, name);
   /* old method (strchr(buf, '\0')) seemd very odd to me -
    * this method should be equivalant and is clearer.
    * Can not use strcat because we need to cycle through
    * all the names.
     }
   return 0;
 }
 /*
  * Returns true if the given object can't fit in the given spot.
  * This is meant for multi space objects - for single space objecs,
  * just calling get_map_blocked and checking that against movement type
  * of object. This function goes through all the parts of the
 maptile::maptile ()
 {
   in_memory = MAP_SWAPPED;
   /* The maps used to pick up default x and y values from the
-   * map archetype.  Mimic that behaviour.
+   * map archetype. Mimic that behaviour.
    */
-  width         = 16;
+  width      = 16;
-  height        = 16;
+  height     = 16;
-  reset_timeout = 0;
-  timeout       = 300;
+  timeout    = 300;
-  enter_x       = 0;
+  max_nrof   = 1000;    // 1000 items of anything
-  enter_y       = 0;
+  max_volume = 2000000; // 2m³
 }
 maptile::maptile (int w, int h)
 {
   in_memory = MAP_SWAPPED;
     {
       keyword kw = thawer.get_kv ();
       switch (kw)
         {
-          case KW_EOF:
-            LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
-            return false;
-          case KW_end:
-            return true;
-          default:
-          case KW_ERROR:
-            LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
-            break;
           case KW_msg:
             thawer.get_ml (KW_endmsg, msg);
             break;
           case KW_lore: // CF+ extension
           case KW_sky:        thawer.get (sky);        break;
           case KW_per_player: thawer.get (per_player); break;
           case KW_per_party:  thawer.get (per_party);  break;
-          case KW_region:     get_region_by_name (thawer.get_str ()); break;
+          case KW_region:     default_region = region::find (thawer.get_str ()); break;
           case KW_shopitems:  shopitems = parse_shop_string (thawer.get_str ()); break;
           //   old names            new names
           case KW_hp:          case KW_enter_x:         thawer.get (enter_x);  break;
           case KW_sp:          case KW_enter_y:         thawer.get (enter_y);  break;
           case KW_tile_path_1: thawer.get (tile_path [0]); break;
           case KW_tile_path_2: thawer.get (tile_path [1]); break;
           case KW_tile_path_3: thawer.get (tile_path [2]); break;
           case KW_tile_path_4: thawer.get (tile_path [3]); break;
+          case KW_end:
+            return true;
+          default:
+            if (!thawer.parse_error (kw, "map", 0))
+              return false;
+            break;
         }
     }
   abort ();
 }
   MAP_OUT (reset_time);
   MAP_OUT (reset_timeout);
   MAP_OUT (fixed_resettime);
   MAP_OUT (difficulty);
-  if (region) MAP_OUT2 (region, region->name);
+  if (default_region) MAP_OUT2 (region, default_region->name);
   if (shopitems)
     {
       char shop[MAX_BUF];
       print_shop_string (this, shop);
  * Remove and free all objects in the given map.
  */
 void
 maptile::clear ()
 {
+  sfree (regions, size ()), regions = 0;
+  free (regionmap), regionmap = 0;
-  if (!spaces)
+  if (spaces)
-    return;
+    {
-  for (mapspace *ms = spaces + size (); ms-- > spaces; )
+      for (mapspace *ms = spaces + size (); ms-- > spaces; )
-    while (object *op = ms->bot)
+        while (object *op = ms->bot)
-      {
+          {
-        if (op->head)
+            if (op->head)
-          op = op->head;
+              op = op->head;
-        op->destroy_inv (false);
+            op->destroy_inv (false);
-        op->destroy ();
+            op->destroy ();
-      }
+          }
-  sfree (spaces, size ()), spaces = 0;
+      sfree (spaces, size ()), spaces = 0;
+    }
   if (buttons)
     free_objectlinkpt (buttons), buttons = 0;
 }
 void
 mapspace::update_ ()
 {
   object *tmp, *last = 0;
   uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
-  New_Face *top, *floor, *middle;
+  facetile *top, *floor, *middle;
   object *top_obj, *floor_obj, *middle_obj;
   MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
   middle = blank_face;
   top    = blank_face;
   faces [0] = top;    faces_obj [0] = top    != blank_face ? top_obj    : 0;
   faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
   faces [2] = floor;  faces_obj [2] = floor  != blank_face ? floor_obj  : 0;
 }
+uint64
+mapspace::volume () const
+{
+  uint64 vol = 0;
+  for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
+    vol += op->volume ();
+  return vol;
+}
 /* this updates the orig_map->tile_map[tile_num] value after finding
  * the map.  It also takes care of linking back the freshly found
  * maps tile_map values if it tiles back to this one.  It returns
  * the value of orig_map->tile_map[tile_num].
  */
 /**
  * Return whether map2 is adjacent to map1. If so, store the distance from
  * map1 to map2 in dx/dy.
  */
-static int
+int
 adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
 {
   if (!map1 || !map2)
     return 0;
 /* From map.c
  * This is used by get_player to determine where the other
  * creature is.  get_rangevector takes into account map tiling,
  * so you just can not look the the map coordinates and get the
  * righte value.  distance_x/y are distance away, which
- * can be negativbe.  direction is the crossfire direction scheme
+ * can be negative.  direction is the crossfire direction scheme
  * that the creature should head.  part is the part of the
  * monster that is closest.
  *
  * get_rangevector looks at op1 and op2, and fills in the
  * structure for op1 to get to op2.
 get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
 {
   if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
     {
       /* be conservative and fill in _some_ data */
-      retval->distance = 100000;
+      retval->distance = 10000;
-      retval->distance_x = 32767;
+      retval->distance_x = 10000;
-      retval->distance_y = 32767;
+      retval->distance_y = 10000;
       retval->direction = 0;
       retval->part = 0;
     }
   else
     {
       best = op1;
       /* If this is multipart, find the closest part now */
       if (!(flags & 0x1) && op1->more)
         {
-          object *tmp;
           int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
           /* we just take the offset of the piece to head to figure
            * distance instead of doing all that work above again
            * since the distance fields we set above are positive in the
            * same axis as is used for multipart objects, the simply arithmetic
            * below works.
            */
-          for (tmp = op1->more; tmp != NULL; tmp = tmp->more)
+          for (object *tmp = op1->more; tmp; tmp = tmp->more)
             {
               tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
                 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
               if (tmpi < best_distance)
                 {
               retval->distance_y += op1->y - best->y;
             }
         }
       retval->part = best;
-      retval->distance = idistance (retval->distance_x, retval->distance_y);
+      retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
       retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
     }
 }
 /* this is basically the same as get_rangevector above, but instead of
  * flags has no meaning for this function at this time - I kept it in to
  * be more consistant with the above function and also in case they are needed
  * for something in the future.  Also, since no object is pasted, the best
  * field of the rv_vector is set to NULL.
  */
 void
-get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags)
+get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
 {
   if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
     {
       /* be conservative and fill in _some_ data */
       retval->distance = 100000;
     op->remove ();
   return insert_ob_in_map_at (op, this, originator, flags, x, y);
 }
+region *
+maptile::region (int x, int y) const
+{
+  if (regions
+      && regionmap
+      && !OUT_OF_REAL_MAP (this, x, y))
+    if (struct region *reg = regionmap [regions [y * width + x]])
+      return reg;
+  if (default_region)
+    return default_region;
+  return ::region::default_region ();
+}

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.76 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs. Revision 1.86 by root, Thu Feb 15 15:43:36 2007 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.76 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.86 by root, Thu Feb 15 15:43:36 2007 UTC