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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.564 by elmex, Thu Apr 28 14:58:08 2011 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC

    for (@$files) {
       utf8::decode $_;
       next if /\.(?:pl|pst)$/;
       next unless /^$PATH_SEP/o;
-      push @paths, cf::map::normalise "~$pl/$_", $pl->map;
+      push @paths, cf::map::normalise "~$pl/$_";
    }
    \@paths
 }
    # {...        are special paths that are not being touched
    # ?xxx/...    are special absolute paths
    # ?random/... random maps
    # /...        normal maps
    # ~user/...   per-player map of a specific user
-   # !up !down   for quad maps, or other maps with up/down layers
    $path =~ s/$PATH_SEP/\//go;
    # treat it as relative path if it starts with
    # something that looks reasonable
    if ($path =~ m{^(?:\./|\.\./|\w)}) {
       $base or Carp::carp "normalise called with relative path and no base: '$path'";
       $base =~ s{[^/]+/?$}{};
       $path = "$base/$path";
-   } elsif ($path eq '!up') {
-      $base && ref $base
-         or Carp::carp "normalise called with relative tile path and no base: '$path'";
-      my $uppth = $base->tile_path (cf::TILE_UP);
-      $path = $uppth if $uppth;
-   } elsif ($path eq '!down') {
-      $base && ref $base
-         or Carp::carp "normalise called with relative tile path and no base: '$path'";
-      my $dpth = $base->tile_path (cf::TILE_DOWN);
-      $path = $dpth if $dpth;
    }
    for ($path) {
       redo if s{/\.?/}{/};
       redo if s{/[^/]+/\.\./}{/};
    $self->{load_path} = $path;
    1
 }
+# used to laod the header of an original map
 sub load_header_orig {
    my ($self) = @_;
    $self->load_header_from ($self->load_path)
 }
+# used to laod the header of an instantiated map
 sub load_header_temp {
    my ($self) = @_;
    $self->load_header_from ($self->save_path)
 }
+# called after loading the header from an instantiated map
 sub prepare_temp {
    my ($self) = @_;
    $self->last_access ((delete $self->{last_access})
                        || $cf::RUNTIME); #d#
    # safety
    $self->{instantiate_time} = $cf::RUNTIME
       if $self->{instantiate_time} > $cf::RUNTIME;
 }
+# called after loading the header from an original map
 sub prepare_orig {
    my ($self) = @_;
    $self->{load_original} = 1;
    $self->{instantiate_time} = $cf::RUNTIME;
    {
       my $guard = cf::lock_acquire "map_data:$path";
       return unless $self->valid;
-      return unless $self->in_memory == cf::MAP_SWAPPED;
+      return unless $self->state == cf::MAP_SWAPPED;
-      $self->in_memory (cf::MAP_LOADING);
       $self->alloc;
       $self->pre_load;
       cf::cede_to_tick;
                }
             }
          }
          $f->resolve_delayed_derefs;
+      } else {
+         $self->post_load_original
+            if delete $self->{load_original};
       }
+      $self->state (cf::MAP_INACTIVE);
       cf::cede_to_tick;
       # now do the right thing for maps
       $self->link_multipart_objects;
       $self->difficulty ($self->estimate_difficulty)
       unless ($self->{deny_activate}) {
          $self->decay_objects;
          $self->fix_auto_apply;
          $self->update_buttons;
          cf::cede_to_tick;
-         $self->activate;
+         #$self->activate; # no longer activate maps automatically
       }
       $self->{last_save} = $cf::RUNTIME;
       $self->last_access ($cf::RUNTIME);
-      $self->in_memory (cf::MAP_ACTIVE);
    }
    $self->post_load;
    1
 }
 sub find_sync {
    my ($path, $origin) = @_;
+   # it's a bug to call this from the main context
    return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
       if $Coro::current == $Coro::main;
    find $path, $origin
 }
 sub do_load_sync {
    my ($map) = @_;
+   # it's a bug to call this from the main context
    return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
       if $Coro::current == $Coro::main;
    $map->load;
 }
 sub find_async {
    my ($path, $origin, $load) = @_;
    $path = normalise $path, $origin;
    if (my $map = $cf::MAP{$path}) {
-      return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
+      return $map if !$load || $map->linkable;
    }
    $MAP_PREFETCH{$path} |= $load;
    $MAP_PREFETCHER ||= cf::async {
 sub swap_out {
    my ($self) = @_;
    my $lock = cf::lock_acquire "map_data:$self->{path}";
-   return if $self->in_memory != cf::MAP_ACTIVE;
+   return if !$self->linkable;
    return if $self->{deny_save};
    return if $self->players;
    # first deactivate the map and "unlink" it from the core
    $self->deactivate;
    $_->clear_links_to ($self) for values %cf::MAP;
-   $self->in_memory (cf::MAP_SWAPPED);
+   $self->state (cf::MAP_SWAPPED);
    # then atomically save
    $self->_save;
    # then free the map
    return if $self->players;
    cf::trace "resetting map ", $self->path, "\n";
-   $self->in_memory (cf::MAP_SWAPPED);
+   $self->state (cf::MAP_SWAPPED);
    # need to save uniques path
    unless ($self->{deny_save}) {
       my $uniq = $self->uniq_path; utf8::encode $uniq;
       $Coro::current->{desc} = "enter_exit";
       unless (eval {
          $self->deactivate_recursive; # just to be sure
-         # random map handling
-         {
-            my $guard = cf::lock_acquire "exit_prepare:$exit";
-            prepare_random_map $exit
-               if $exit->slaying eq "/!";
-         }
          my $map = cf::map::normalise $exit->slaying, $exit->map;
          my $x   = $exit->stats->hp;
          my $y   = $exit->stats->sp;
+         # special map handling
+         my $slaying = $exit->slaying;
+         # special map handling
+         if ($slaying eq "/!") {
+            my $guard = cf::lock_acquire "exit_prepare:$exit";
+            prepare_random_map $exit
+               if $exit->slaying eq "/!"; # need to re-check after getting the lock
+            $map = $exit->slaying;
+         } elsif ($slaying eq '!up') {
+            $map = $exit->map->tile_path (cf::TILE_UP);
+            $x = $exit->x;
+            $y = $exit->y;
+         } elsif ($slaying eq '!down') {
+            $map = $exit->map->tile_path (cf::TILE_DOWN);
+            $x = $exit->x;
+            $y = $exit->y;
+         }
          $self->goto ($map, $x, $y);
          # if exit is damned, update players death & WoR home-position
          $self->contr->savebed ($map, $x, $y)

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.564 by elmex, Thu Apr 28 14:58:08 2011 UTC vs. Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.564 by elmex, Thu Apr 28 14:58:08 2011 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC