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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.118 by root, Mon Jan 1 21:19:52 2007 UTC

    $path = $path->as_string if ref $path;
    my $self = bless { }, $class;
+   # {...        are special paths that are not touched
+   # ?xxx/...    are special absolute paths
+   # ?random/... random maps
+   # /!          non-realised random map exit
+   # /...        normal maps
+   # ~/...       per-player maps without a specific player (DO NOT USE)
+   # ~user/...   per-player map of a specific user
+   if ($path =~ /^{/) {
+      # fine as it is
-   if ($path =~ s{^\?random/}{}) {
+   } elsif ($path =~ s{^\?random/}{}) {
       Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
       $self->{random} = cf::from_json $data;
    } else {
       if ($path =~ s{^~([^/]+)?}{}) {
          $self->{user_rel} = 1;
       (aio_load "$filename.pst", $av) >= 0
          or return;
       $av = eval { (Storable::thaw $av)->{objs} };
    }
+   warn sprintf "loading %s (%d)\n",
+      $filename, length $data, scalar @{$av || []};#d#
    return ($data, $av);
 }
 #############################################################################
 # command handling &c
          $map->instantiate;
          # per-player maps become, after loading, normal maps
          $map->per_player (0) if $path->{user_rel};
       }
+      #Coro::Timer::sleep 1;#d#
       $map->path ($key);
       $map->{path} = $path;
+      $map->{last_save} = $cf::RUNTIME;
       $map->last_access ($cf::RUNTIME);
       if ($map->should_reset) {
          $map->reset;
          $map = find_map $path;
 }
 sub save {
    my ($self) = @_;
+   $self->{last_save} = $cf::RUNTIME;
+   return unless $self->dirty;
    my $save = $self->{path}->save_path; utf8::encode $save;
    my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
-   $self->{last_save} = $cf::RUNTIME;
-   return unless $self->dirty;
    $self->{load_path} = $save;
    return if $self->{deny_save};
 sub reset_at {
    my ($self) = @_;
    # TODO: safety, remove and allow resettable per-player maps
-   return 1e100 if $self->{path}{user_rel};
+   return 1e99 if $self->{path}{user_rel};
-   return 1e100 if $self->{deny_reset};
+   return 1e99 if $self->{deny_reset};
    my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
-   my $to = $self->reset_timeout || $DEFAULT_RESET;
+   my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
-   $to = $MAX_RESET if $to > $MAX_RESET;
    $time + $to
 }
 sub should_reset {
    $self->unlink_save;
    delete $cf::MAP{$self->path};
    $self->{path} = new cf::path $new_path;
-   $self->path ($self->{path}->path);
+   $self->path ($self->{path}->as_string);
    $cf::MAP{$self->path} = $self;
    $self->save;
 }
    $_->clear_links_to ($self) for values %cf::MAP;
    $self->unlink_save;
    $self->destroy;
+}
+my $nuke_counter = "aaaa";
+sub nuke {
+   my ($self) = @_;
+   $self->{deny_save} = 1;
+   $self->reset_timeout (1);
+   $self->rename ("{nuke}/" . ($nuke_counter++));
+   $self->reset; # polite request, might not happen
 }
 sub customise_for {
    my ($map, $ob) = @_;
       (ref $cf::CFG{"may_$access"}
          ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
          : $cf::CFG{"may_$access"})
 }
+=item $player_object->enter_link
+Freezes the player and moves him/her to a special map (C<{link}>).
+The player should be reaosnably safe there for short amounts of time. You
+I<MUST> call C<leave_link> as soon as possible, though.
+=item $player_object->leave_link ($map, $x, $y)
+Moves the player out of the specila link map onto the given map. If the
+map is not valid (or omitted), the player will be moved back to the
+location he/she was before the call to C<enter_link>, or, if that fails,
+to the emergency map position.
+Might block.
+=cut
 sub cf::object::player::enter_link {
    my ($self) = @_;
    return if $self->map == $LINK_MAP;
    my ($self, $map, $x, $y) = @_;
    my $link_pos = delete $self->{_link_pos};
    unless ($map) {
-      $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
       # restore original map position
       ($map, $x, $y) = @{ $link_pos || [] };
       $map = cf::map::find_map $map;
       unless ($map) {
    $self->activate_recursive;
    $self->enter_map ($map, $x, $y);
 }
-=item $player_object->goto_map ($map, $x, $y)
+=item $player_object->goto_map ($path, $x, $y)
 =cut
 sub cf::object::player::goto_map {
    my ($self, $path, $x, $y) = @_;
       my $map = cf::map::find_map $path->as_string;
       $map = $map->customise_for ($self) if $map;
       warn "entering ", $map->path, " at ($x, $y)\n"
          if $map;
+      $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
       $self->leave_link ($map, $x, $y);
    })->prio (1);
 }
 }
 sub main {
    # we must not ever block the main coroutine
    local $Coro::idle = sub {
-      Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d#
+      Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
       (Coro::unblock_sub {
          Event::one_event;
       })->();
    };

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.113 by root, Mon Jan 1 15:32:40 2007 UTC vs. Revision 1.118 by root, Mon Jan 1 21:19:52 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.118 by root, Mon Jan 1 21:19:52 2007 UTC