ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.195 by root, Fri Jan 26 20:59:57 2007 UTC vs.
Revision 1.199 by root, Mon Jan 29 14:46:01 2007 UTC

82mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
85 85
86our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
87 89
88############################################################################# 90#############################################################################
89 91
90=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
91 93
1078 for (@$files) { 1080 for (@$files) {
1079 utf8::decode $_; 1081 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1082 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1083 next unless /^$PATH_SEP/o;
1082 1084
1083 s/\.map$//;
1084 push @paths, "~" . $pl->ob->name . "/" . $_; 1085 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1085 } 1086 }
1086 1087
1087 \@paths 1088 \@paths
1088} 1089}
1089 1090
1178sub normalise { 1179sub normalise {
1179 my ($path, $base) = @_; 1180 my ($path, $base) = @_;
1180 1181
1181 $path = "$path"; # make sure its a string 1182 $path = "$path"; # make sure its a string
1182 1183
1184 $path =~ s/\.map$//;
1185
1183 # map plan: 1186 # map plan:
1184 # 1187 #
1185 # /! non-realised random map exit (special hack!) 1188 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1189 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1190 # ?xxx/... are special absolute paths
1379sub pre_load { } 1382sub pre_load { }
1380sub post_load { } 1383sub post_load { }
1381 1384
1382sub load { 1385sub load {
1383 my ($self) = @_; 1386 my ($self) = @_;
1387
1388 local $self->{deny_reset} = 1; # loading can take a long time
1384 1389
1385 my $path = $self->{path}; 1390 my $path = $self->{path};
1386 my $guard = cf::lock_acquire "map_load:$path"; 1391 my $guard = cf::lock_acquire "map_load:$path";
1387 1392
1388 return if $self->in_memory != cf::MAP_SWAPPED; 1393 return if $self->in_memory != cf::MAP_SWAPPED;
1626 for (@$files) { 1631 for (@$files) {
1627 utf8::decode $_; 1632 utf8::decode $_;
1628 next if /\.pst$/; 1633 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1634 next unless /^$PATH_SEP/o;
1630 1635
1631 s/\.map$//; 1636 push @paths, cf::map::normalise $_;
1632 push @paths, $_;
1633 } 1637 }
1634 1638
1635 \@paths 1639 \@paths
1636} 1640}
1637 1641
1731=cut 1735=cut
1732 1736
1733sub link_map { 1737sub link_map {
1734 unless ($LINK_MAP) { 1738 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 1739 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1740 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 1741 $LINK_MAP->load;
1738 } 1742 }
1739 1743
1740 $LINK_MAP 1744 $LINK_MAP
1741} 1745}
1825 my ($self, $path, $x, $y) = @_; 1829 my ($self, $path, $x, $y) = @_;
1826 1830
1827 $self->enter_link; 1831 $self->enter_link;
1828 1832
1829 (async { 1833 (async {
1834 my $map = eval {
1830 my $map = cf::map::find $path; 1835 my $map = cf::map::find $path;
1831 $map = $map->customise_for ($self) if $map; 1836 $map = $map->customise_for ($self) if $map;
1832 1837 $map
1833# warn "entering ", $map->path, " at ($x, $y)\n" 1838 } or
1834# if $map;
1835
1836 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1839 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1837 1840
1838 $self->leave_link ($map, $x, $y); 1841 $self->leave_link ($map, $x, $y);
1839 })->prio (1); 1842 })->prio (1);
1840} 1843}
1841 1844
1872 # that depends on the exit object 1875 # that depends on the exit object
1873 1876
1874 my $rmp = parse_random_map_params $exit->msg; 1877 my $rmp = parse_random_map_params $exit->msg;
1875 1878
1876 if ($exit->map) { 1879 if ($exit->map) {
1877 $rmp->{region} = $exit->map->region_name; 1880 $rmp->{region} = $exit->region->name;
1878 $rmp->{origin_map} = $exit->map->path; 1881 $rmp->{origin_map} = $exit->map->path;
1879 $rmp->{origin_x} = $exit->x; 1882 $rmp->{origin_x} = $exit->x;
1880 $rmp->{origin_y} = $exit->y; 1883 $rmp->{origin_y} = $exit->y;
1881 } 1884 }
1882 1885

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines