--- deliantra/server/lib/cf.pm	2007/04/18 17:32:07	1.253
+++ deliantra/server/lib/cf.pm	2007/04/21 16:56:32	1.256
@@ -163,7 +163,7 @@
       $msg .= "\n"
          unless $msg =~ /\n$/;
 
-      $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
+      $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
 
       utf8::encode $msg;
       LOG llevError, $msg;
@@ -1354,7 +1354,7 @@
 sub load_path {
    my ($self) = @_;
 
-   "$MAPDIR($self->{path}"
+   "$MAPDIR/$self->{path}.map"
 }
 
 # the temporary/swap location
@@ -1362,7 +1362,7 @@
    my ($self) = @_;
 
    (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
-   "$TMPDIR/$path"
+   "$TMPDIR/$path.map"
 }
 
 # the unique path, undef == no special unique path
@@ -1492,53 +1492,56 @@
    local $self->{deny_reset} = 1; # loading can take a long time
 
    my $path = $self->{path};
-   my $guard = cf::lock_acquire "map_load:$path";
 
-   return if $self->in_memory != cf::MAP_SWAPPED;
+   {
+      my $guard = cf::lock_acquire "map_load:$path";
 
-   $self->in_memory (cf::MAP_LOADING);
+      return if $self->in_memory != cf::MAP_SWAPPED;
 
-   $self->alloc;
+      $self->in_memory (cf::MAP_LOADING);
 
-   $self->pre_load;
-   Coro::cede;
+      $self->alloc;
 
-   $self->_load_objects ($self->{load_path}, 1)
-      or return;
+      $self->pre_load;
+      Coro::cede;
 
-   $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
-      if delete $self->{load_original};
+      $self->_load_objects ($self->{load_path}, 1)
+         or return;
 
-   if (my $uniq = $self->uniq_path) {
-      utf8::encode $uniq;
-      if (aio_open $uniq, O_RDONLY, 0) {
-         $self->clear_unique_items;
-         $self->_load_objects ($uniq, 0);
-      }
-   }
+      $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
+         if delete $self->{load_original};
 
-   Coro::cede;
-   # now do the right thing for maps
-   $self->link_multipart_objects;
-   Coro::cede;
+      if (my $uniq = $self->uniq_path) {
+         utf8::encode $uniq;
+         if (aio_open $uniq, O_RDONLY, 0) {
+            $self->clear_unique_items;
+            $self->_load_objects ($uniq, 0);
+         }
+      }
 
-   unless ($self->{deny_activate}) {
-      $self->decay_objects;
-      $self->fix_auto_apply;
-      $self->update_buttons;
       Coro::cede;
-      $self->set_darkness_map;
+      # now do the right thing for maps
+      $self->link_multipart_objects;
       $self->difficulty ($self->estimate_difficulty)
          unless $self->difficulty;
       Coro::cede;
-      $self->activate;
-      Coro::cede;
+
+      unless ($self->{deny_activate}) {
+         $self->decay_objects;
+         $self->fix_auto_apply;
+         $self->update_buttons;
+         Coro::cede;
+         $self->set_darkness_map;
+         Coro::cede;
+         $self->activate;
+      }
+
+      $self->in_memory (cf::MAP_IN_MEMORY);
+
+      undef $guard;
    }
 
    $self->post_load;
-   Coro::cede;
-
-   $self->in_memory (cf::MAP_IN_MEMORY);
 }
 
 sub customise_for {