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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.169 by root, Sun Jan 14 01:09:46 2007 UTC vs.
Revision 1.172 by root, Sun Jan 14 13:32:48 2007 UTC

 our @CB_CLIENT     = ();
 our @CB_TYPE       = (); # registry for type (cf-object class) based events
 our @CB_MAP        = ();
 my %attachment;
+sub cf::attachable::thawer_merge {
+   # simply override everything except _meta
+   local $_[0]{_meta};
+   %{$_[0]} = %{$_[1]};
+}
 sub _attach_cb($$$$) {
    my ($registry, $event, $prio, $cb) = @_;
    use sort 'stable';
 }
 # also paths starting with '/'
 $EXT_MAP{"cf::map"} = qr{^(?=/)};
+sub thawer_merge {
+   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 {
    my ($path, $base) = @_;
    # map plan:
    #
 sub unlink_save {
    my ($self) = @_;
    utf8::encode (my $save = $self->save_path);
-   IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
+   IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
-   IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
+   IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
 }
 sub load_header_from($) {
    my ($self, $path) = @_;
       $map->load_header
          or return;
       if ($map->should_reset) {
+         $cf::WAIT_FOR_TICK->wait;
          $map->reset;
          undef $guard;
          $map = find $path
             or return;
       }

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