--- deliantra/server/ext/map-random.ext	2007/06/11 21:38:13	1.17
+++ deliantra/server/ext/map-random.ext	2008/04/15 03:16:02	1.22
@@ -8,7 +8,7 @@
    $self->{random_id} = $1;
 
    if (0 < Coro::AIO::aio_load "$cf::RANDOMDIR/$self->{random_id}.meta", my $data) {
-      $self->{random} = cf::from_json $data;
+      $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";
@@ -76,15 +76,11 @@
 }
 
 # clean up old temp maps regularly
-Event->timer (
-   reentrant => 0,
-   data      => cf::WF_AUTOCANCEL,
-   interval  => 3600,
-   after     => 60,
-   cb        => Coro::unblock_sub { clean_random_maps },
-);
+our $CLEAN_RANDOM_MAPS = cf::periodic 3600, Coro::unblock_sub {
+   clean_random_maps;
+};
 
-# map generator stresstest, never enable under normal circumstances
+# map generator stresstest, NEVER enable under normal circumstances
 if (0) {
    cf::async {
       my $seed = 0;
@@ -93,10 +89,10 @@
          $map->generate_random_map ({
             region => "scorn",
             random_seed => $seed++,
-            xsize => 12,
-            ysize => 12,
+            xsize => (int rand 90) + 3,
+            ysize => (int rand 90) + 3,
          });
-         warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
+#         warn sprintf "%d: %d %d\n", $seed, $map->width, $map->height;#d#
          $map->destroy;
       }
    };