--- deliantra/server/lib/cf.pm	2007/06/05 13:05:02	1.274
+++ deliantra/server/lib/cf.pm	2007/06/10 04:24:50	1.277
@@ -1307,8 +1307,6 @@
    # we have to keep some variables in memory intact
    local $self->{path};
    local $self->{load_path};
-   local $self->{deny_save};
-   local $self->{deny_reset};
 
    $self->SUPER::thawer_merge ($merge);
 }
@@ -1418,6 +1416,14 @@
       for grep $_->outdoor, values %cf::MAP;
 }
 
+sub decay_objects {
+   my ($self) = @_;
+
+   return if $self->{deny_reset};
+
+   $self->do_decay_objects;
+}
+
 sub unlink_save {
    my ($self) = @_;
 
@@ -1483,6 +1489,9 @@
       $self->prepare_orig;
    }
 
+   $self->{deny_reset} = 1
+      if $self->no_reset;
+
    $self->default_region (cf::region::find_by_path $self->{path})
       unless $self->default_region;
 
@@ -1507,7 +1516,7 @@
       $map->load_header
          or return;
 
-      if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
+      if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
          # doing this can freeze the server in a sync job, obviously
          #$cf::WAIT_FOR_TICK->wait;
          $map->reset;
@@ -1584,6 +1593,9 @@
    return find "~" . $ob->name . "/" . $self->{path}
       if $self->per_player;
 
+#   return find "?party/" . $ob->name . "/" . $self->{path}
+#      if $self->per_party;
+
    $self
 }
 
@@ -1703,7 +1715,6 @@
    my ($self) = @_;
 
    # TODO: safety, remove and allow resettable per-player maps
-   return 1e99 if $self->isa ("ext::map_per_player");#d#
    return 1e99 if $self->{deny_reset};
 
    my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
@@ -1724,7 +1735,6 @@
    my $lock = cf::lock_acquire "map_data:$self->{path}";
 
    return if $self->players;
-   return if $self->isa ("ext::map_per_player");#d#
 
    warn "resetting map ", $self->path;
 
@@ -1768,28 +1778,58 @@
    $self->reset; # polite request, might not happen
 }
 
-=item cf::map::unique_maps
+=item $maps = cf::map::tmp_maps
 
-Returns an arrayref of paths of all shared maps that have
-instantiated unique items. May block.
+Returns an arrayref with all map paths of currently instantiated and saved
+maps. May block.
 
 =cut
 
-sub unique_maps() {
-   my $files = aio_readdir $UNIQUEDIR
-      or return;
+sub tmp_maps() {
+   [
+      map {
+         utf8::decode $_;
+         /\.map$/
+            ? normalise $_
+            : ()
+      } @{ aio_readdir $TMPDIR or [] }
+   ]
+}
 
-   my @paths;
+=item $maps = cf::map::random_maps
 
-   for (@$files) {
-      utf8::decode $_;
-      next if /\.pst$/;
-      next unless /^$PATH_SEP/o;
+Returns an arrayref with all map paths of currently instantiated and saved
+random maps. May block.
 
-      push @paths, cf::map::normalise $_;
-   }
+=cut
+
+sub random_maps() {
+   [
+      map {
+         utf8::decode $_;
+         /\.map$/
+            ? normalise "?random/$_"
+            : ()
+      } @{ aio_readdir $RANDOMDIR or [] }
+   ]
+}
+
+=item cf::map::unique_maps
 
-   \@paths
+Returns an arrayref of paths of all shared maps that have
+instantiated unique items. May block.
+
+=cut
+
+sub unique_maps() {
+   [
+      map {
+         utf8::decode $_;
+         /\.map$/
+            ? normalise $_
+            : ()
+      } @{ aio_readdir $UNIQUEDIR or [] }
+   ]
 }
 
 package cf;