… | |
… | |
82 | mkdir cf::localdir . "/" . cf::tmpdir; |
82 | mkdir cf::localdir . "/" . cf::tmpdir; |
83 | mkdir cf::localdir . "/" . cf::uniquedir; |
83 | mkdir cf::localdir . "/" . cf::uniquedir; |
84 | mkdir $RANDOM_MAPS; |
84 | mkdir $RANDOM_MAPS; |
85 | |
85 | |
86 | our $EMERGENCY_POSITION; |
86 | our $EMERGENCY_POSITION; |
|
|
87 | |
|
|
88 | sub cf::map::normalise; |
87 | |
89 | |
88 | ############################################################################# |
90 | ############################################################################# |
89 | |
91 | |
90 | =head2 GLOBAL VARIABLES |
92 | =head2 GLOBAL VARIABLES |
91 | |
93 | |
… | |
… | |
774 | } |
776 | } |
775 | } else { |
777 | } else { |
776 | aio_unlink $filename; |
778 | aio_unlink $filename; |
777 | aio_unlink "$filename.pst"; |
779 | aio_unlink "$filename.pst"; |
778 | } |
780 | } |
|
|
781 | |
|
|
782 | #d##TODO# nuke non .map-files if exist |
|
|
783 | if ($filename =~ s/\.map$//) { |
|
|
784 | aio_unlink $filename; |
|
|
785 | aio_unlink "$filename.pst"; |
|
|
786 | } |
779 | } |
787 | } |
780 | } |
788 | } |
781 | |
789 | |
782 | sub object_freezer_as_string { |
790 | sub object_freezer_as_string { |
783 | my ($rdata, $objs) = @_; |
791 | my ($rdata, $objs) = @_; |
… | |
… | |
789 | |
797 | |
790 | sub object_thawer_load { |
798 | sub object_thawer_load { |
791 | my ($filename) = @_; |
799 | my ($filename) = @_; |
792 | |
800 | |
793 | my ($data, $av); |
801 | my ($data, $av); |
|
|
802 | |
|
|
803 | #d#TODO remove .map if file does not exist |
|
|
804 | aio_stat $filename and $filename =~ s/\.map$//; |
794 | |
805 | |
795 | (aio_load $filename, $data) >= 0 |
806 | (aio_load $filename, $data) >= 0 |
796 | or return; |
807 | or return; |
797 | |
808 | |
798 | unless (aio_stat "$filename.pst") { |
809 | unless (aio_stat "$filename.pst") { |
… | |
… | |
1078 | for (@$files) { |
1089 | for (@$files) { |
1079 | utf8::decode $_; |
1090 | utf8::decode $_; |
1080 | next if /\.(?:pl|pst)$/; |
1091 | next if /\.(?:pl|pst)$/; |
1081 | next unless /^$PATH_SEP/o; |
1092 | next unless /^$PATH_SEP/o; |
1082 | |
1093 | |
1083 | s/\.map$//; |
|
|
1084 | push @paths, "~" . $pl->ob->name . "/" . $_; |
1094 | push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_; |
1085 | } |
1095 | } |
1086 | |
1096 | |
1087 | \@paths |
1097 | \@paths |
1088 | } |
1098 | } |
1089 | |
1099 | |
… | |
… | |
1178 | sub normalise { |
1188 | sub normalise { |
1179 | my ($path, $base) = @_; |
1189 | my ($path, $base) = @_; |
1180 | |
1190 | |
1181 | $path = "$path"; # make sure its a string |
1191 | $path = "$path"; # make sure its a string |
1182 | |
1192 | |
|
|
1193 | $path =~ s/\.map$//; |
|
|
1194 | |
1183 | # map plan: |
1195 | # map plan: |
1184 | # |
1196 | # |
1185 | # /! non-realised random map exit (special hack!) |
1197 | # /! non-realised random map exit (special hack!) |
1186 | # {... are special paths that are not being touched |
1198 | # {... are special paths that are not being touched |
1187 | # ?xxx/... are special absolute paths |
1199 | # ?xxx/... are special absolute paths |
… | |
… | |
1248 | |
1260 | |
1249 | # the original (read-only) location |
1261 | # the original (read-only) location |
1250 | sub load_path { |
1262 | sub load_path { |
1251 | my ($self) = @_; |
1263 | my ($self) = @_; |
1252 | |
1264 | |
1253 | sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} |
1265 | sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} |
1254 | } |
1266 | } |
1255 | |
1267 | |
1256 | # the temporary/swap location |
1268 | # the temporary/swap location |
1257 | sub save_path { |
1269 | sub save_path { |
1258 | my ($self) = @_; |
1270 | my ($self) = @_; |
1259 | |
1271 | |
1260 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; |
1272 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; |
1261 | sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path |
1273 | sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path |
1262 | } |
1274 | } |
1263 | |
1275 | |
1264 | # the unique path, undef == no special unique path |
1276 | # the unique path, undef == no special unique path |
1265 | sub uniq_path { |
1277 | sub uniq_path { |
1266 | my ($self) = @_; |
1278 | my ($self) = @_; |
… | |
… | |
1282 | my ($self) = @_; |
1294 | my ($self) = @_; |
1283 | |
1295 | |
1284 | utf8::encode (my $save = $self->save_path); |
1296 | utf8::encode (my $save = $self->save_path); |
1285 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1297 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1286 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; |
1298 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; |
|
|
1299 | |
|
|
1300 | #d#TODO remove .map and also nuke |
|
|
1301 | $save =~ s/\.map// or return;#d# |
|
|
1302 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d# |
|
|
1303 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d# |
1287 | } |
1304 | } |
1288 | |
1305 | |
1289 | sub load_header_from($) { |
1306 | sub load_header_from($) { |
1290 | my ($self, $path) = @_; |
1307 | my ($self, $path) = @_; |
1291 | |
1308 | |
1292 | utf8::encode $path; |
1309 | utf8::encode $path; |
1293 | aio_open $path, O_RDONLY, 0 |
1310 | #aio_open $path, O_RDONLY, 0 |
1294 | or return; |
1311 | # or return; |
1295 | |
1312 | |
1296 | $self->_load_header ($path) |
1313 | $self->_load_header ($path) |
1297 | or return; |
1314 | or return; |
1298 | |
1315 | |
1299 | $self->{load_path} = $path; |
1316 | $self->{load_path} = $path; |
… | |
… | |
1379 | sub pre_load { } |
1396 | sub pre_load { } |
1380 | sub post_load { } |
1397 | sub post_load { } |
1381 | |
1398 | |
1382 | sub load { |
1399 | sub load { |
1383 | my ($self) = @_; |
1400 | my ($self) = @_; |
|
|
1401 | |
|
|
1402 | local $self->{deny_reset} = 1; # loading can take a long time |
1384 | |
1403 | |
1385 | my $path = $self->{path}; |
1404 | my $path = $self->{path}; |
1386 | my $guard = cf::lock_acquire "map_load:$path"; |
1405 | my $guard = cf::lock_acquire "map_load:$path"; |
1387 | |
1406 | |
1388 | return if $self->in_memory != cf::MAP_SWAPPED; |
1407 | return if $self->in_memory != cf::MAP_SWAPPED; |
… | |
… | |
1626 | for (@$files) { |
1645 | for (@$files) { |
1627 | utf8::decode $_; |
1646 | utf8::decode $_; |
1628 | next if /\.pst$/; |
1647 | next if /\.pst$/; |
1629 | next unless /^$PATH_SEP/o; |
1648 | next unless /^$PATH_SEP/o; |
1630 | |
1649 | |
1631 | s/\.map$//; |
1650 | push @paths, cf::map::normalise $_; |
1632 | push @paths, $_; |
|
|
1633 | } |
1651 | } |
1634 | |
1652 | |
1635 | \@paths |
1653 | \@paths |
1636 | } |
1654 | } |
1637 | |
1655 | |
… | |
… | |
1731 | =cut |
1749 | =cut |
1732 | |
1750 | |
1733 | sub link_map { |
1751 | sub link_map { |
1734 | unless ($LINK_MAP) { |
1752 | unless ($LINK_MAP) { |
1735 | $LINK_MAP = cf::map::find "{link}" |
1753 | $LINK_MAP = cf::map::find "{link}" |
1736 | or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; |
1754 | or cf::cleanup "FATAL: unable to provide {link} map, exiting."; |
1737 | $LINK_MAP->load; |
1755 | $LINK_MAP->load; |
1738 | } |
1756 | } |
1739 | |
1757 | |
1740 | $LINK_MAP |
1758 | $LINK_MAP |
1741 | } |
1759 | } |
… | |
… | |
1825 | my ($self, $path, $x, $y) = @_; |
1843 | my ($self, $path, $x, $y) = @_; |
1826 | |
1844 | |
1827 | $self->enter_link; |
1845 | $self->enter_link; |
1828 | |
1846 | |
1829 | (async { |
1847 | (async { |
|
|
1848 | my $map = eval { |
1830 | my $map = cf::map::find $path; |
1849 | my $map = cf::map::find $path; |
1831 | $map = $map->customise_for ($self) if $map; |
1850 | $map = $map->customise_for ($self) if $map; |
1832 | |
1851 | $map |
1833 | # warn "entering ", $map->path, " at ($x, $y)\n" |
1852 | } or |
1834 | # if $map; |
|
|
1835 | |
|
|
1836 | $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
1853 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
1837 | |
1854 | |
1838 | $self->leave_link ($map, $x, $y); |
1855 | $self->leave_link ($map, $x, $y); |
1839 | })->prio (1); |
1856 | })->prio (1); |
1840 | } |
1857 | } |
1841 | |
1858 | |
… | |
… | |
1872 | # that depends on the exit object |
1889 | # that depends on the exit object |
1873 | |
1890 | |
1874 | my $rmp = parse_random_map_params $exit->msg; |
1891 | my $rmp = parse_random_map_params $exit->msg; |
1875 | |
1892 | |
1876 | if ($exit->map) { |
1893 | if ($exit->map) { |
1877 | $rmp->{region} = $exit->map->region_name; |
1894 | $rmp->{region} = $exit->region->name; |
1878 | $rmp->{origin_map} = $exit->map->path; |
1895 | $rmp->{origin_map} = $exit->map->path; |
1879 | $rmp->{origin_x} = $exit->x; |
1896 | $rmp->{origin_x} = $exit->x; |
1880 | $rmp->{origin_y} = $exit->y; |
1897 | $rmp->{origin_y} = $exit->y; |
1881 | } |
1898 | } |
1882 | |
1899 | |