--- deliantra/server/lib/cf.pm	2007/01/27 23:59:29	1.196
+++ deliantra/server/lib/cf.pm	2007/02/01 19:40:42	1.203
@@ -85,6 +85,8 @@
 
 our $EMERGENCY_POSITION;
 
+sub cf::map::normalise;
+
 #############################################################################
 
 =head2 GLOBAL VARIABLES
@@ -776,6 +778,12 @@
          aio_unlink $filename;
          aio_unlink "$filename.pst";
       }
+
+      #d##TODO# nuke non .map-files if exist
+      if ($filename =~ s/\.map$//) {
+         aio_unlink $filename;
+         aio_unlink "$filename.pst";
+      }
    }
 }
 
@@ -792,6 +800,9 @@
 
    my ($data, $av);
 
+   #d#TODO remove .map if file does not exist
+   aio_stat $filename and $filename =~ s/\.map$//;
+
    (aio_load $filename, $data) >= 0
       or return;
 
@@ -1070,6 +1081,8 @@
 sub maps($) {
    my ($pl) = @_;
 
+   $pl = ref $pl ? $pl->ob->name : $pl;
+
    my $files = aio_readdir playerdir $pl
       or return;
 
@@ -1080,8 +1093,7 @@
       next if /\.(?:pl|pst)$/;
       next unless /^$PATH_SEP/o;
 
-      s/\.map$//;
-      push @paths, "~" . $pl->ob->name . "/" . $_;
+      push @paths, cf::map::normalise "~$pl/$_";
    }
 
    \@paths
@@ -1180,6 +1192,8 @@
 
    $path = "$path"; # make sure its a string
 
+   $path =~ s/\.map$//;
+
    # map plan:
    #
    # /!          non-realised random map exit (special hack!)
@@ -1250,7 +1264,7 @@
 sub load_path {
    my ($self) = @_;
 
-   sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
+   sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
 }
 
 # the temporary/swap location
@@ -1258,7 +1272,7 @@
    my ($self) = @_;
 
    (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
-   sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
+   sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
 }
 
 # the unique path, undef == no special unique path
@@ -1284,14 +1298,19 @@
    utf8::encode (my $save = $self->save_path);
    IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
    IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
+
+   #d#TODO remove .map and also nuke
+   $save =~ s/\.map// or return;#d#
+   IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
+   IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
 }
 
 sub load_header_from($) {
    my ($self, $path) = @_;
 
    utf8::encode $path;
-   aio_open $path, O_RDONLY, 0
-      or return;
+   #aio_open $path, O_RDONLY, 0
+   #   or return;
 
    $self->_load_header ($path)
       or return;
@@ -1630,8 +1649,7 @@
       next if /\.pst$/;
       next unless /^$PATH_SEP/o;
 
-      s/\.map$//;
-      push @paths, $_;
+      push @paths, cf::map::normalise $_;
    }
 
    \@paths
@@ -1829,13 +1847,12 @@
    $self->enter_link;
 
    (async {
-      my $map = cf::map::find $path;
-      $map = $map->customise_for ($self) if $map;
-
-#      warn "entering ", $map->path, " at ($x, $y)\n"
-#         if $map;
-
-      $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
+      my $map = eval {
+         my $map = cf::map::find $path;
+         $map = $map->customise_for ($self) if $map;
+         $map
+      } or
+         $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
 
       $self->leave_link ($map, $x, $y);
    })->prio (1);
@@ -1876,7 +1893,7 @@
    my $rmp = parse_random_map_params $exit->msg;
 
    if ($exit->map) {
-      $rmp->{region}     = $exit->map->region_name;
+      $rmp->{region}     = $exit->region->name;
       $rmp->{origin_map} = $exit->map->path;
       $rmp->{origin_x}   = $exit->x;
       $rmp->{origin_y}   = $exit->y;
@@ -1988,6 +2005,7 @@
          or return; # be conservative, not sure how that can happen, but we saw a crash here
 
       (shift @$queue)->[1]->($msg);
+      return unless $ns->valid; # temporary(?) workaround for callback destroying socket
 
       push @{ $ns->{query_queue} }, @$queue;
 
@@ -2254,7 +2272,12 @@
 }
 
 #############################################################################
-# the server's main()
+# the server's init and main functions
+
+sub load_resources {
+   load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
+      or die "unable to load regions file\n";#d#
+}
 
 sub cfg_load {
    open my $fh, "<:utf8", cf::confdir . "/config"
@@ -2277,6 +2300,10 @@
    }
 }
 
+sub init {
+   load_resources;
+}
+
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
@@ -2445,6 +2472,9 @@
       warn "reattaching attachments to maps";
       reattach $_ for values %MAP;
 
+      warn "loading reloadable resources";
+      load_resources;
+
       warn "restarting server ticker";
 
       $TICK_WATCHER->start;