--- deliantra/server/common/map.C	2006/08/28 16:12:59	1.11
+++ deliantra/server/common/map.C	2006/08/31 17:54:14	1.18
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.11 2006/08/28 16:12:59 root Exp $";
+ *   "$Id: map.C,v 1.18 2006/08/31 17:54:14 root Exp $";
  */
 
 /*
@@ -175,16 +175,8 @@
      */
     endbuf = buf + strlen(buf);
    
-    for (i = 0; i < NROF_COMPRESS_METHODS; i++) {
-      if (uncomp[i][0])
-        strcpy(endbuf, uncomp[i][0]);
-      else
-        *endbuf = '\0';
-      if (!stat (buf, &statbuf))
-        break;
-    }
-    if (i == NROF_COMPRESS_METHODS)
-      return (-1);
+    if (stat (buf, &statbuf))
+      return -1;
     if (!S_ISREG (statbuf.st_mode))
         return (-1);
 
@@ -538,7 +530,7 @@
          * or editor will not be able to do anything with it either.
          */
         if (op->arch==NULL) {
-            LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)");
+            LOG(llevDebug,"Discarding object without arch: %s\n", op->name?(const char *)op->name:"(null)");
             continue;
         }
 
@@ -897,6 +889,8 @@
          */
         else if (!strcmp(key,"oid")) {
             fp.get (m, atoi(value));
+        } else if (!strcmp(key, "attach")) {
+            m->attach = add_string (value);
         } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) {
             m->enter_x = atoi(value);
         } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) {
@@ -949,8 +943,6 @@
             m->sky = atoi(value);
         } else if (!strcmp(key, "nosmooth")) {
             m->nosmooth = atoi(value);
-        } else if (!strcmp(key, "safe_map")) {
-            m->safe_map = atoi(value);
         }
         else if (!strncmp(key,"tile_path_", 10)) {
             int tile=atoi(key+10);
@@ -1017,9 +1009,7 @@
  */
 
 mapstruct *load_original_map(const char *filename, int flags) {
-    FILE *fp;
     mapstruct *m;
-    int comp;
     char pathname[MAX_BUF];
     
     LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
@@ -1030,12 +1020,10 @@
     else
         strcpy(pathname, create_pathname(filename));
 
-    if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
-        LOG(llevError, "Can't open %s: %s\n", pathname, strerror_local(errno));
-        return (NULL);
-    }
+    object_thawer thawer (pathname);
 
-    object_thawer thawer (fp, filename);
+    if (!thawer)
+      return 0;
 
     m = get_linked_map();
 
@@ -1051,12 +1039,12 @@
 
     m->in_memory=MAP_LOADING;
     load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE));
-    close_and_delete(fp, comp);
+
     m->in_memory=MAP_IN_MEMORY;
     if (!MAP_DIFFICULTY(m)) 
         MAP_DIFFICULTY(m)=calculate_difficulty(m);
     set_map_reset_time(m);
-    INVOKE_MAP (INSTANTIATE, m);
+    m->instantiate ();
     return (m);
 }
 
@@ -1067,7 +1055,6 @@
  */
 
 static mapstruct *load_temporary_map(mapstruct *m) {
-    FILE *fp;
     int comp;
     char buf[MAX_BUF];
     
@@ -1081,17 +1068,17 @@
         return m;
     }
 
-    if((fp=open_and_uncompress(m->tmpname,0, &comp))==NULL) {
-        LOG(llevError, "Cannot open %s: %s\n",m->tmpname, strerror_local(errno));
-        strcpy(buf, m->path);
-        delete_map(m);
-        m = load_original_map(buf, 0);
-        if(m==NULL) return NULL;
-        fix_auto_apply(m); /* Chests which open as default */
-        return m;
-    }
+    object_thawer thawer (m->tmpname);
 
-    object_thawer thawer (fp, m->tmpname);
+    if (!thawer)
+      {
+        strcpy (buf, m->path);
+        delete_map (m);
+        m = load_original_map (buf, 0);
+        if (!m) return NULL;
+        fix_auto_apply (m); /* Chests which open as default */
+        return m;
+      }
 
     if (load_map_header(thawer, m)) {
         LOG(llevError,"Error loading map header for %s (%s)\n",
@@ -1104,7 +1091,7 @@
 
     m->in_memory=MAP_LOADING;
     load_objects (m, thawer, 0);
-    close_and_delete(fp, comp);
+
     m->in_memory=MAP_IN_MEMORY;
     INVOKE_MAP (SWAPIN, m);
     return m;
@@ -1117,18 +1104,14 @@
  */
 
 mapstruct *load_overlay_map(const char *filename, mapstruct *m) {
-    FILE *fp;
-    int comp;
     char pathname[MAX_BUF];
 
     strcpy(pathname, create_overlay_pathname(filename));
 
-    if((fp=open_and_uncompress(pathname, 0, &comp))==NULL) {
-/*        LOG(llevDebug,"Can't open overlay %s\n", pathname);*/
-        return m;
-    }
+    object_thawer thawer (pathname);
 
-    object_thawer thawer (fp, pathname);
+    if (!thawer)
+      return m;
     
     if (load_map_header(thawer, m)) {
         LOG(llevError,"Error loading map header for overlay %s (%s)\n",
@@ -1141,7 +1124,7 @@
 
     m->in_memory=MAP_LOADING;
     load_objects (m, thawer, MAP_OVERLAY);
-    close_and_delete(fp, comp);
+
     m->in_memory=MAP_IN_MEMORY;
     return m;
 }
@@ -1180,8 +1163,7 @@
  * m is the map to load unique items into.
  */
 static void load_unique_objects(mapstruct *m) {
-    FILE *fp;
-    int comp,count;
+    int count;
     char firstname[MAX_BUF];
 
     for (count=0; count<10; count++) {
@@ -1191,22 +1173,17 @@
     /* If we get here, we did not find any map */
     if (count==10) return;
 
-    if ((fp=open_and_uncompress(firstname, 0, &comp))==NULL) {
-        /* There is no expectation that every map will have unique items, but this
-         * is debug output, so leave it in.
-         */
-        LOG(llevDebug, "Can't open unique items file for %s\n", create_items_path(m->path));
-        return;
-    }
+    object_thawer thawer (firstname);
 
-    object_thawer thawer (fp, firstname);
+    if (!thawer)
+      return;
 
     m->in_memory=MAP_LOADING;
     if (m->tmpname == NULL)    /* if we have loaded unique items from */
       delete_unique_items(m); /* original map before, don't duplicate them */
     load_object(thawer, NULL, LO_NOREAD,0);
     load_objects (m, thawer, 0);
-    close_and_delete(fp, comp);
+
     m->in_memory=MAP_IN_MEMORY;
 }
 
@@ -1250,95 +1227,95 @@
     {
       if (!m->tmpname)
         m->tmpname = tempnam_local (settings.tmpdir, NULL);
+
       strcpy (filename, m->tmpname);
     }
 
   LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
   m->in_memory = MAP_SAVING;
 
-  object_freezer fp (filename);
+  object_freezer freezer;
 
   /* legacy */
-  fprintf (fp, "arch map\n");
+  fprintf (freezer, "arch map\n");
   if (m->name)
-    fprintf (fp, "name %s\n", m->name);
+    fprintf (freezer, "name %s\n", m->name);
   if (!flag)
-    fprintf (fp, "swap_time %d\n", m->swap_time);
+    fprintf (freezer, "swap_time %d\n", m->swap_time);
   if (m->reset_timeout)
-    fprintf (fp, "reset_timeout %d\n", m->reset_timeout);
+    fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
   if (m->fixed_resettime)
-    fprintf (fp, "fixed_resettime %d\n", m->fixed_resettime);
+    fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
   /* we unfortunately have no idea if this is a value the creator set
    * or a difficulty value we generated when the map was first loaded
    */
   if (m->difficulty)
-    fprintf (fp, "difficulty %d\n", m->difficulty);
+    fprintf (freezer, "difficulty %d\n", m->difficulty);
   if (m->region)
-    fprintf (fp, "region %s\n", m->region->name);
+    fprintf (freezer, "region %s\n", m->region->name);
   if (m->shopitems)
     {
       print_shop_string (m, shop);
-      fprintf (fp, "shopitems %s\n", shop);
+      fprintf (freezer, "shopitems %s\n", shop);
     }
   if (m->shopgreed)
-    fprintf (fp, "shopgreed %f\n", m->shopgreed);
+    fprintf (freezer, "shopgreed %f\n", m->shopgreed);
 #ifndef WIN32
   if (m->shopmin)
-    fprintf (fp, "shopmin %llu\n", m->shopmin);
+    fprintf (freezer, "shopmin %llu\n", m->shopmin);
   if (m->shopmax)
-    fprintf (fp, "shopmax %llu\n", m->shopmax);
+    fprintf (freezer, "shopmax %llu\n", m->shopmax);
 #else
   if (m->shopmin)
-    fprintf (fp, "shopmin %I64u\n", m->shopmin);
+    fprintf (freezer, "shopmin %I64u\n", m->shopmin);
   if (m->shopmax)
-    fprintf (fp, "shopmax %I64u\n", m->shopmax);
+    fprintf (freezer, "shopmax %I64u\n", m->shopmax);
 #endif
   if (m->shoprace)
-    fprintf (fp, "shoprace %s\n", m->shoprace);
+    fprintf (freezer, "shoprace %s\n", m->shoprace);
   if (m->darkness)
-    fprintf (fp, "darkness %d\n", m->darkness);
+    fprintf (freezer, "darkness %d\n", m->darkness);
   if (m->width)
-    fprintf (fp, "width %d\n", m->width);
+    fprintf (freezer, "width %d\n", m->width);
   if (m->height)
-    fprintf (fp, "height %d\n", m->height);
+    fprintf (freezer, "height %d\n", m->height);
   if (m->enter_x)
-    fprintf (fp, "enter_x %d\n", m->enter_x);
+    fprintf (freezer, "enter_x %d\n", m->enter_x);
   if (m->enter_y)
-    fprintf (fp, "enter_y %d\n", m->enter_y);
+    fprintf (freezer, "enter_y %d\n", m->enter_y);
   if (m->msg)
-    fprintf (fp, "msg\n%sendmsg\n", m->msg);
+    fprintf (freezer, "msg\n%sendmsg\n", m->msg);
   if (m->maplore)
-    fprintf (fp, "maplore\n%sendmaplore\n", m->maplore);
+    fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
   if (m->unique)
-    fprintf (fp, "unique %d\n", m->unique);
+    fprintf (freezer, "unique %d\n", m->unique);
   if (m->templatemap)
-    fprintf (fp, "template %d\n", m->templatemap);
+    fprintf (freezer, "template %d\n", m->templatemap);
   if (m->outdoor)
-    fprintf (fp, "outdoor %d\n", m->outdoor);
+    fprintf (freezer, "outdoor %d\n", m->outdoor);
   if (m->temp)
-    fprintf (fp, "temp %d\n", m->temp);
+    fprintf (freezer, "temp %d\n", m->temp);
   if (m->pressure)
-    fprintf (fp, "pressure %d\n", m->pressure);
+    fprintf (freezer, "pressure %d\n", m->pressure);
   if (m->humid)
-    fprintf (fp, "humid %d\n", m->humid);
+    fprintf (freezer, "humid %d\n", m->humid);
   if (m->windspeed)
-    fprintf (fp, "windspeed %d\n", m->windspeed);
+    fprintf (freezer, "windspeed %d\n", m->windspeed);
   if (m->winddir)
-    fprintf (fp, "winddir %d\n", m->winddir);
+    fprintf (freezer, "winddir %d\n", m->winddir);
   if (m->sky)
-    fprintf (fp, "sky %d\n", m->sky);
+    fprintf (freezer, "sky %d\n", m->sky);
   if (m->nosmooth)
-    fprintf (fp, "nosmooth %d\n", m->nosmooth);
-  if (m->safe_map)
-    fprintf (fp, "safe_map %d\n", m->safe_map);
+    fprintf (freezer, "nosmooth %d\n", m->nosmooth);
 
   /* Save any tiling information, except on overlays */
   if (flag != 2)
     for (i = 0; i < 4; i++)
       if (m->tile_path[i])
-        fprintf (fp, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
+        fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
 
-  fprintf (fp, "end\n");
+  freezer.put (m);
+  fprintf (freezer, "end\n");
 
   /* In the game save unique items in the different file, but
    * in the editor save them to the normal map file.
@@ -1347,20 +1324,24 @@
    */
   if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
     {
-      sprintf (buf, "%s.v00", create_items_path (m->path));
-
-      object_freezer fp2 (buf);
+      object_freezer unique;
 
       if (flag == 2)
-        save_objects (m, fp, fp2, 2);
+        save_objects (m, freezer, unique, 2);
       else
-        save_objects (m, fp, fp2, 0);
+        save_objects (m, freezer, unique, 0);
+
+      sprintf (buf, "%s.v00", create_items_path (m->path));
+
+      unique.save (buf);
     }
   else
     {                                /* save same file when not playing, like in editor */
-      save_objects (m, fp, fp, 0);
+      save_objects (m, freezer, freezer, 0);
     }
 
+  freezer.save (filename);
+
   return 0;
 }
 
@@ -1585,6 +1566,9 @@
                 return NULL;
         }
 
+        if (flags & MAP_PLAYER_UNIQUE)
+          INVOKE_MAP (SWAPIN, m);
+
     } else {
         /* If in this loop, we found a temporary map, so load it up. */