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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.164 by root, Thu Jan 11 01:24:25 2007 UTC vs.
Revision 1.165 by root, Fri Jan 12 22:09:22 2007 UTC

 # the unique path, undef == no special unique path
 sub uniq_path {
    my ($self) = @_;
+   $self->{user_rel} || $self->{ext}
+      ? undef
-   sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
+      : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
+}
+sub customise_for {
+   my ($self, $map, $ob) = @_;
+   if ($map->per_player) {
+      return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
+   }
+   $map
 }
 # this is somewhat ugly, but style maps do need special treatment
 sub is_style_map {
    $_[0]{path} =~ m{^/styles/}
    $self->reset_timeout (1);
    $self->rename ("{nuke}/" . ($nuke_counter++));
    $self->reset; # polite request, might not happen
 }
-sub customise_for {
-   my ($map, $ob) = @_;
-   if ($map->per_player) {
-      return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
-   }
-   $map
-}
 =item cf::map::unique_maps
 Returns an arrayref of cf::path's of all shared maps that have
 instantiated unique items. May block.
    $self->enter_link;
    (async {
       my $map = cf::map::find $path->as_string;
-      $map = $map->customise_for ($self) if $map;
+      $map = $map->{path}->customise_for ($map, $self) if $map;
 #      warn "entering ", $map->path, " at ($x, $y)\n"
 #         if $map;
       $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);

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