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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.191 by root, Tue Jan 23 01:05:18 2007 UTC vs.
Revision 1.196 by root, Sat Jan 27 23:59:29 2007 UTC

 use Storable;
 use Opcode;
 use Safe;
 use Safe::Hole;
-use Coro 3.4 ();
+use Coro 3.5 ();
 use Coro::Event;
 use Coro::Timer;
 use Coro::Signal;
 use Coro::Semaphore;
 use Coro::AIO;
 }
 sub normalise {
    my ($path, $base) = @_;
+   $path = "$path"; # make sure its a string
    # map plan:
    #
    # /!          non-realised random map exit (special hack!)
    # {...        are special paths that are not being touched
    # ?xxx/...    are special absolute paths
          $self->init; # pass $1 etc.
          return $self;
       }
    }
-   Carp::carp "unable to resolve path '$path'.";
+   Carp::carp "unable to resolve path '$path' (base '$base').";
    ()
 }
 sub init {
    my ($self) = @_;
       $map->{last_save} = $cf::RUNTIME;
       $map->load_header
          or return;
-      if ($map->should_reset) {
+      if ($map->should_reset && 0) {#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;
-         $map = find $path
+         return find $path;
-            or return;
       }
       $cf::MAP{$path} = $map
    }
 }
 sub pre_load  { }
 sub post_load { }
 sub load {
    my ($self) = @_;
+   local $self->{deny_reset} = 1; # loading can take a long time
    my $path = $self->{path};
    my $guard = cf::lock_acquire "map_load:$path";
    return if $self->in_memory != cf::MAP_SWAPPED;
 =cut
 sub link_map {
    unless ($LINK_MAP) {
       $LINK_MAP = cf::map::find "{link}"
-         or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
+         or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
       $LINK_MAP->load;
    }
    $LINK_MAP
 }
    return if UNIVERSAL::isa $self->map, "ext::map_link";
    $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
       if $self->map;
-   $self->enter_map ($LINK_MAP || link_map, 20, 20);
+   $self->enter_map ($LINK_MAP || link_map, 10, 10);
 }
 sub cf::object::player::leave_link {
    my ($self, $map, $x, $y) = @_;
 sub cf::object::player::enter_exit {
    my ($self, $exit) = @_;
    return unless $self->type == cf::PLAYER;
+   if ($exit->slaying eq "/!") {
+      #TODO: this should de-fi-ni-te-ly not be a sync-job
+      cf::sync_job { prepare_random_map $exit };
+   }
+   my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
+   my $hp      = $exit->stats->hp;
+   my $sp      = $exit->stats->sp;
    $self->enter_link;
    (async {
       $self->deactivate_recursive; # just to be sure
       unless (eval {
-         prepare_random_map $exit
+         $self->goto ($slaying, $hp, $sp);
-            if $exit->slaying eq "/!";
-         my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
-         $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
          1;
       }) {
          $self->message ("Something went wrong deep within the crossfire server. "
                      . "I'll try to bring you back to the map you were before. "

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.191 by root, Tue Jan 23 01:05:18 2007 UTC vs. Revision 1.196 by root, Sat Jan 27 23:59:29 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.191 by root, Tue Jan 23 01:05:18 2007 UTC vs.
Revision 1.196 by root, Sat Jan 27 23:59:29 2007 UTC