--- deliantra/server/lib/cf.pm	2007/02/15 03:19:02	1.215
+++ deliantra/server/lib/cf.pm	2007/02/15 21:07:49	1.217
@@ -787,12 +787,6 @@
          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";
-      }
    }
 }
 
@@ -809,9 +803,6 @@
 
    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;
 
@@ -1307,11 +1298,6 @@
    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($) {
@@ -2258,8 +2244,8 @@
 #############################################################################
 # the server's init and main functions
 
-sub load_resources {
-   load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
+sub init_resources {
+   load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
       or die "unable to load regions file\n";#d#
 }
 
@@ -2285,7 +2271,7 @@
 }
 
 sub init {
-   load_resources;
+   init_resources;
 }
 
 sub main {
@@ -2469,7 +2455,7 @@
       reattach $_ for values %MAP;
 
       warn "loading reloadable resources";
-      load_resources;
+      init_resources;
 
       warn "leaving sync_job";