[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.274 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 2007 UTC

    my ($self, $merge) = @_;
    # 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);
 }
 sub normalise {
    $_->change_map_light ($change)
       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) = @_;
    utf8::encode (my $save = $self->save_path);
    IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
       $self->load_header_orig
          or return;
       $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;
    1
 }
       $map->{last_save} = $cf::RUNTIME;
       $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;
          undef $guard;
          return find $path;
    my ($self, $ob) = @_;
    return find "~" . $ob->name . "/" . $self->{path}
       if $self->per_player;
+#   return find "?party/" . $ob->name . "/" . $self->{path}
+#      if $self->per_party;
    $self
 }
 # find and load all maps in the 3x3 area around a map
 sub load_diag {
 sub reset_at {
    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;
    my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
    my ($self) = @_;
    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;
    $self->in_memory (cf::MAP_SWAPPED);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.274 by root, Tue Jun 5 13:05:02 2007 UTC vs. Revision 1.275 by root, Thu Jun 7 19:12:22 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.274 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 2007 UTC