--- deliantra/server/common/map.C	2006/12/30 20:32:30	1.59
+++ deliantra/server/common/map.C	2007/01/14 23:35:03	1.74
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -38,78 +39,9 @@
 const char *
 create_pathname (const char *name)
 {
-  static char buf[MAX_BUF];
-
-  /* Why?  having extra / doesn't confuse unix anyplace?  Dependancies
-   * someplace else in the code? msw 2-17-97
-   */
-  if (*name == '/')
-    sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
-  else
-    sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name);
-  return (buf);
-}
-
-/*
- * same as create_pathname, but for the overlay maps.
- */
-const char *
-create_overlay_pathname (const char *name)
-{
-  static char buf[MAX_BUF];
-
-  /* Why?  having extra / doesn't confuse unix anyplace?  Dependancies
-   * someplace else in the code? msw 2-17-97
-   */
-  if (*name == '/')
-    sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
-  else
-    sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
-  return (buf);
-}
-
-/*
- * same as create_pathname, but for the template maps.
- */
-const char *
-create_template_pathname (const char *name)
-{
-  static char buf[MAX_BUF];
-
-  /* Why?  having extra / doesn't confuse unix anyplace?  Dependancies
-   * someplace else in the code? msw 2-17-97
-   */
-  if (*name == '/')
-    sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
-  else
-    sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
-  return (buf);
-}
-
-/*
- * This makes absolute path to the itemfile where unique objects
- * will be saved. Converts '/' to '@'. I think it's essier maintain
- * files than full directory structure, but if this is problem it can 
- * be changed.
- */
-static const char *
-create_items_path (const char *s)
-{
-  static char buf[MAX_BUF];
-  char *t;
-
-  if (*s == '/')
-    s++;
-
-  sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
-
-  for (t = buf + strlen (buf); *s; s++, t++)
-    if (*s == '/')
-      *t = '@';
-    else
-      *t = *s;
-  *t = 0;
-  return (buf);
+  static char buf[8192];
+  snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
+  return buf;
 }
 
 /*
@@ -400,6 +332,17 @@
   sum_weight (container);
 }
 
+void
+maptile::set_object_flag (int flag, int value)
+{
+  if (!spaces)
+    return;
+
+  for (mapspace *ms = spaces + size (); ms-- > spaces; )
+    for (object *tmp = ms->bot; tmp; tmp = tmp->above)
+      tmp->flag [flag] = value;
+}
+
 /* link_multipart_objects go through all the objects on the map looking
  * for objects whose arch says they are multipart yet according to the
  * info we have, they only have the head (as would be expected when
@@ -459,7 +402,7 @@
  * mapflags is the same as we get with load_original_map
  */
 bool
-maptile::load_objects (object_thawer &thawer)
+maptile::_load_objects (object_thawer &thawer)
 {
   int unique;
   object *op, *prev = NULL, *last_more = NULL, *otmp;
@@ -530,7 +473,7 @@
 
   for (mapspace *ms = spaces + size (); ms-- > spaces; )
     for (object *op = ms->bot; op; op = op->above)
-      op->activate (1);
+      op->activate_recursive ();
 }
 
 void
@@ -541,23 +484,36 @@
 
   for (mapspace *ms = spaces + size (); ms-- > spaces; )
     for (object *op = ms->bot; op; op = op->above)
-      op->deactivate (1);
+      op->deactivate_recursive ();
 }
 
 bool
-maptile::save_objects (object_freezer &freezer, int flags)
+maptile::_save_objects (object_freezer &freezer, int flags)
 {
+  static int cede_count = 0;
+
   if (flags & IO_HEADER)
-    save_header (freezer);
+    _save_header (freezer);
 
   if (!spaces)
     return false;
 
   for (int i = 0; i < size (); ++i)
     {
+#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
+      if (cede_count >= 500)
+        {
+          cede_count = 0;
+          coroapi::cede ();
+        }
+#endif
+
       int unique = 0;
       for (object *op = spaces [i].bot; op; op = op->above)
         {
+          // count per-object, but cede only when modification-safe
+          cede_count++;
+
           if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
             unique = 1;
 
@@ -578,7 +534,7 @@
 }
 
 bool
-maptile::load_objects (const char *path, bool skip_header)
+maptile::_load_objects (const char *path, bool skip_header)
 {
   object_thawer thawer (path);
 
@@ -596,15 +552,15 @@
         thawer.skip_kv (kw);
       }
 
-  return load_objects (thawer);
+  return _load_objects (thawer);
 }
 
 bool
-maptile::save_objects (const char *path, int flags)
+maptile::_save_objects (const char *path, int flags)
 {
   object_freezer freezer;
 
-  if (!save_objects (freezer, flags))
+  if (!_save_objects (freezer, flags))
     return false;
 
   return freezer.save (path);
@@ -778,12 +734,8 @@
  * MSW 2001-07-01
  */
 bool
-maptile::load_header (object_thawer &thawer)
+maptile::_load_header (object_thawer &thawer)
 {
-  char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
-  int msgpos = 0;
-  int maplorepos = 0;
-
   for (;;)
     {
       keyword kw = thawer.get_kv ();
@@ -791,12 +743,17 @@
       switch (kw)
         {
           case KW_EOF:
-            LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path);
+            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;
@@ -856,10 +813,6 @@
           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;
-
-          default:
-            LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
-            break;
         }
     }
 
@@ -867,14 +820,14 @@
 }
 
 bool
-maptile::load_header (const char *path)
+maptile::_load_header (const char *path)
 {
   object_thawer thawer (path);
 
   if (!thawer)
     return false;
 
-  return load_header (thawer);
+  return _load_header (thawer);
 }
 
 /******************************************************************************
@@ -907,7 +860,7 @@
 }
 
 bool
-maptile::save_header (object_freezer &freezer)
+maptile::_save_header (object_freezer &freezer)
 {
 #define MAP_OUT(k)    freezer.put (KW_ ## k, k)
 #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
@@ -959,17 +912,18 @@
   if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
   if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
 
-  MAP_OUT2 (end, 0);
+  freezer.put (this);
+  freezer.put (KW_end);
 
   return true;
 }
 
 bool
-maptile::save_header (const char *path)
+maptile::_save_header (const char *path)
 {
   object_freezer freezer;
 
-  if (!save_header (freezer))
+  if (!_save_header (freezer))
     return false;
 
   return freezer.save (path);
@@ -1158,7 +1112,7 @@
 mapspace::update_ ()
 {
   object *tmp, *last = 0;
-  uint8 flags = 0, light = 0, anywhere = 0;
+  uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
   New_Face *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;
@@ -1285,8 +1239,8 @@
       if ((top != blank_face) && (middle != blank_face))
         break;
 
-      /* Only show visible faces, unless its the editor - show all */
-      if (!tmp->invisible || editor)
+      /* Only show visible faces */
+      if (!tmp->invisible)
         {
           /* Fill in top if needed */
           if (top == blank_face)
@@ -1326,29 +1280,49 @@
   faces [2] = floor;  faces_obj [2] = floor  != blank_face ? floor_obj  : 0;
 }
 
-/* this updates the orig_map->tile_map[tile_num] value after loading
- * the map.  It also takes care of linking back the freshly loaded
+/* 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].  It really only does this
- * so that it is easier for calling functions to verify success.
+ * the value of orig_map->tile_map[tile_num].
  */
-static maptile *
-load_and_link_tiled_map (maptile *orig_map, int tile_num)
+static inline maptile *
+find_and_link (maptile *orig_map, int tile_num)
 {
-  maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]);
-  mp->load ();
+  maptile *mp = orig_map->tile_map [tile_num];
+
+  if (!mp)
+    {
+      mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
+
+      if (!mp)
+        {
+          // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
+          LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
+               &orig_map->tile_path[tile_num], &orig_map->path);
+          mp = new maptile (1, 1);
+          mp->alloc ();
+          mp->in_memory = MAP_IN_MEMORY;
+        }
+    }
 
   int dest_tile = (tile_num + 2) % 4;
 
-  orig_map->tile_map[tile_num] = mp;
+  orig_map->tile_map [tile_num] = mp;
 
-  /* need to do a strcmp here as the orig_map->path is not a shared string */
-  if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
+  // optimisation: back-link map to origin map if euclidean
+  //TODO: non-euclidean maps MUST GO
+  if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
     orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
 
   return mp;
 }
 
+static inline void
+load_and_link (maptile *orig_map, int tile_num)
+{
+  find_and_link (orig_map, tile_num)->load_sync ();
+}
+
 /* this returns TRUE if the coordinates (x,y) are out of
  * map m.  This function also takes into account any
  * tiling considerations, loading adjacant maps as needed.
@@ -1373,7 +1347,7 @@
         return 1;
 
       if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
-        load_and_link_tiled_map (m, 3);
+        find_and_link (m, 3);
 
       return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
     }
@@ -1384,7 +1358,7 @@
         return 1;
 
       if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
-        load_and_link_tiled_map (m, 1);
+        find_and_link (m, 1);
 
       return out_of_map (m->tile_map[1], x - m->width, y);
     }
@@ -1395,7 +1369,7 @@
         return 1;
 
       if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
-        load_and_link_tiled_map (m, 0);
+        find_and_link (m, 0);
 
       return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
     }
@@ -1406,7 +1380,7 @@
         return 1;
 
       if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
-        load_and_link_tiled_map (m, 2);
+        find_and_link (m, 2);
 
       return out_of_map (m->tile_map[2], x, y - m->height);
     }
@@ -1421,65 +1395,57 @@
  * instead we return NULL if no map is valid (coordinates
  * out of bounds and no tiled map), otherwise it returns
  * the map as that the coordinates are really on, and 
- * updates x and y to be the localized coordinates.
+ * updates x and y to be the localised coordinates.
  * Using this is more efficient of calling out_of_map
  * and then figuring out what the real map is
  */
 maptile *
-get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
+maptile::xy_find (sint16 &x, sint16 &y)
 {
-  if (*x < 0)
+  if (x < 0)
     {
-      if (!m->tile_path[3])
+      if (!tile_path[3])
         return 0;
 
-      if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
-        load_and_link_tiled_map (m, 3);
-
-      *x += m->tile_map[3]->width;
-      return (get_map_from_coord (m->tile_map[3], x, y));
+      find_and_link (this, 3);
+      x += tile_map[3]->width;
+      return tile_map[3]->xy_find (x, y);
     }
 
-  if (*x >= m->width)
+  if (x >= width)
     {
-      if (!m->tile_path[1])
+      if (!tile_path[1])
         return 0;
 
-      if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
-        load_and_link_tiled_map (m, 1);
-
-      *x -= m->width;
-      return (get_map_from_coord (m->tile_map[1], x, y));
+      find_and_link (this, 1);
+      x -= width;
+      return tile_map[1]->xy_find (x, y);
     }
 
-  if (*y < 0)
+  if (y < 0)
     {
-      if (!m->tile_path[0])
+      if (!tile_path[0])
         return 0;
 
-      if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
-        load_and_link_tiled_map (m, 0);
-
-      *y += m->tile_map[0]->height;
-      return (get_map_from_coord (m->tile_map[0], x, y));
+      find_and_link (this, 0);
+      y += tile_map[0]->height;
+      return tile_map[0]->xy_find (x, y);
     }
 
-  if (*y >= m->height)
+  if (y >= height)
     {
-      if (!m->tile_path[2])
+      if (!tile_path[2])
         return 0;
 
-      if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
-        load_and_link_tiled_map (m, 2);
-
-      *y -= m->height;
-      return (get_map_from_coord (m->tile_map[2], x, y));
+      find_and_link (this, 2);
+      y -= height;
+      return tile_map[2]->xy_find (x, y);
     }
 
   /* Simple case - coordinates are within this local
    * map.
    */
-  return m;
+  return this;
 }
 
 /**
@@ -1492,6 +1458,8 @@
   if (!map1 || !map2)
     return 0;
 
+  //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
+  //fix: compare paths instead (this is likely faster, too!)
   if (map1 == map2)
     {
       *dx = 0;
@@ -1563,6 +1531,23 @@
   return 1;
 }
 
+maptile *
+maptile::xy_load (sint16 &x, sint16 &y)
+{
+  maptile *map = xy_find (x, y);
+
+  if (map)
+    map->load_sync ();
+
+  return map;
+}
+
+maptile *
+get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
+{
+  return m->xy_load (*x, *y);
+}
+
 /* From map.c
  * This is used by get_player to determine where the other
  * creature is.  get_rangevector takes into account map tiling,