--- deliantra/server/common/map.C	2006/08/30 06:06:26	1.14
+++ deliantra/server/common/map.C	2006/08/30 16:30:37	1.16
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.14 2006/08/30 06:06:26 root Exp $";
+ *   "$Id: map.C,v 1.16 2006/08/30 16:30:37 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);
 
@@ -1183,6 +1175,9 @@
 
     object_thawer thawer (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 */
@@ -1566,6 +1561,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. */