--- deliantra/server/lib/cf.pm	2007/06/01 06:04:08	1.271
+++ deliantra/server/lib/cf.pm	2007/06/10 04:24:50	1.277
@@ -189,7 +189,8 @@
 @safe::cf::player::ISA         = @cf::player::ISA         = 'cf::attachable';
 @safe::cf::client::ISA         = @cf::client::ISA         = 'cf::attachable';
 @safe::cf::map::ISA            = @cf::map::ISA            = 'cf::attachable';
-@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
+@safe::cf::arch::ISA           = @cf::arch::ISA           = 'cf::object';
+@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
 
 # we bless all objects into (empty) derived classes to force a method lookup
 # within the Safe compartment.
@@ -424,7 +425,7 @@
    aio_rename "$runtime~", $runtime
       and return;
 
-   warn "runtime file written.\n";#d#
+   warn "runtime file written.\n";
 
    1
 }
@@ -874,7 +875,7 @@
    }
 
    warn sprintf "loading %s (%d)\n",
-      $filename, length $data, scalar @{$av || []};#d#
+      $filename, length $data, scalar @{$av || []};
    return ($data, $av);
 }
 
@@ -1306,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);
 }
@@ -1417,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) = @_;
 
@@ -1482,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;
 
@@ -1506,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;
@@ -1583,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
 }
 
@@ -1702,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;
@@ -1723,9 +1735,8 @@
    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;#d#
+   warn "resetting map ", $self->path;
 
    $self->in_memory (cf::MAP_SWAPPED);
 
@@ -1767,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
 
-   \@paths
+sub random_maps() {
+   [
+      map {
+         utf8::decode $_;
+         /\.map$/
+            ? normalise "?random/$_"
+            : ()
+      } @{ aio_readdir $RANDOMDIR or [] }
+   ]
+}
+
+=item cf::map::unique_maps
+
+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;
@@ -2561,6 +2602,7 @@
 
    reload_regions;
    reload_facedata;
+   #reload_archetypes;#d#
    reload_archetypes;
    reload_treasures;