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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.61 by root, Sun Dec 31 17:17:22 2006 UTC vs.
Revision 1.67 by elmex, Wed Jan 3 02:51:09 2007 UTC

  * it really should be called create_mapname
  */
 const char *
 create_pathname (const char *name)
 {
-  static char buf[MAX_BUF];
+  static char buf[8192];
-  /* 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);
+  snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
-  return (buf);
+  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);
 }
 /*
  * This function checks if a file with the given path exists.
  * -1 is returned if it fails, otherwise the mode of the file
    * carrying.
    */
   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
  * they are saved).  We do have to look for the old maps that did save
  * the more sections and not re-add sections for them.
 }
 bool
 maptile::save_objects (object_freezer &freezer, int flags)
 {
+  static int cede_count = 0;
   if (flags & IO_HEADER)
     save_header (freezer);
   if (!spaces)
     return false;
   for (int i = 0; i < size (); ++i)
     {
+      if (cede_count >= 500)
+        {
+          cede_count = 0;
+          coroapi::cede ();
+        }
       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;
           if (!op->can_map_save ())
             continue;
   if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
   if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
   if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
   if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
+  freezer.put (this);
   freezer.put (KW_end);
   return true;
 }
       /* If two top faces are already set, quit processing */
       if ((top != blank_face) && (middle != blank_face))
         break;
-      /* Only show visible faces, unless its the editor - show all */
+      /* Only show visible faces */
-      if (!tmp->invisible || editor)
+      if (!tmp->invisible)
         {
           /* Fill in top if needed */
           if (top == blank_face)
             {
               top = tmp->face;
 /* This is basically the same as out_of_map above, but
  * 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)

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.61 by root, Sun Dec 31 17:17:22 2006 UTC vs. Revision 1.67 by elmex, Wed Jan 3 02:51:09 2007 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.61 by root, Sun Dec 31 17:17:22 2006 UTC vs.
Revision 1.67 by elmex, Wed Jan 3 02:51:09 2007 UTC