--- deliantra/server/ext/map-random.ext	2010/04/13 03:24:32	1.42
+++ deliantra/server/ext/map-random.ext	2012/02/03 03:01:45	1.47
@@ -2,6 +2,8 @@
 
 use Coro::AIO;
 
+CONF META_TIMEOUT : map_random_meta_timeout = 86400 * 7;
+
 cf::map->register (qr{^\?random/([0-9a-f]{32})});
 
 sub init {
@@ -13,7 +15,7 @@
       $self->{random} = cf::decode_json $data;
       $self->{random}{custom} ||= "$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}";
    } else {
-      warn "unable to read meta file for $self->{random_id}\n";
+      cf::info "unable to read meta file for $self->{random_id}\n";
       return 0;
    }
 
@@ -147,12 +149,10 @@
 }
 
 cf::async_ext {
-   eCoro::current->{desc} = "random map meta file cleaner";
+   local $Coro::current->{desc} = "random map meta file cleaner";
    $Coro::current->nice (1);
 
    while () {
-      my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
-
       Coro::AnyEvent::idle_upto $META_TIMEOUT / 10 * 2;
 
       my ($files) = Coro::AIO::aio_readdirx $cf::RANDOMDIR, IO::AIO::READDIR_STAT_ORDER
@@ -167,7 +167,7 @@
          my $age = $cf::NOW - (stat _)[8];
 
          if ($age > $META_TIMEOUT) {
-            warn "resetting random meta data for $file";
+            cf::trace "resetting random meta data for $file";
             IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
          }
       }
@@ -185,8 +185,8 @@
          $map->generate_random_map ({
             region => "scorn",
             random_seed => $seed++,
-            xsize => (int rand 100) + 1,
-            ysize => (int rand 100) + 1,
+            xsize => (cf::rndm 1, 100),
+            ysize => (cf::rndm 1, 100),
          });
          warn sprintf "%d: %dx%d o# %d\n", $seed, $map->width, $map->height, &cf::object::objects_size;#d#
          $map->destroy;
@@ -227,5 +227,3 @@
    };
 }
 
-1
-