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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.108 by root, Sun Dec 31 21:02:05 2006 UTC vs.
Revision 1.109 by root, Sun Dec 31 22:23:12 2006 UTC

    my ($class, $path, $base) = @_;
    my $self = bless { }, $class;
    if ($path =~ s{^\?random/}{}) {
+      Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
-      $self->{random} = cf::from_json $path;
+      $self->{random} = cf::from_json $data;
    } else {
       if ($path =~ s{^~([^/]+)?}{}) {
          $self->{user_rel} = 1;
          if (defined $1) {
 # the displayed name, this is a one way mapping
 sub visible_name {
    my ($self) = @_;
-   $self->{random} ? "?random/$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}/$self->{random}{dungeon_level}"
+#   if (my $rmp = $self->{random}) {
-                   : $self->as_string
+#      # todo: be more intelligent about this
+#      "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
+#   } else {
+      $self->as_string
+#   }
 }
 # escape the /'s in the path
 sub _escaped_path  {
    # ∕ is U+2215
 # the temporary/swap location
 sub save_path {
    my ($self) = @_;
    $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
-   : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, Digest::MD5::md5_hex $self->{path}
+   : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
                      : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
 }
 # the unique path, might be eq to save_path
 sub uniq_path {

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