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.194 by root, Wed Jan 24 22:42:49 2007 UTC vs.
Revision 1.201 by root, Mon Jan 29 18:15:23 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
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
782sub object_freezer_as_string { 790sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
789 797
790sub object_thawer_load { 798sub 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") {
1068=cut 1079=cut
1069 1080
1070sub maps($) { 1081sub maps($) {
1071 my ($pl) = @_; 1082 my ($pl) = @_;
1072 1083
1084 $pl = ref $pl ? $pl->ob->name : $pl;
1085
1073 my $files = aio_readdir playerdir $pl 1086 my $files = aio_readdir playerdir $pl
1074 or return; 1087 or return;
1075 1088
1076 my @paths; 1089 my @paths;
1077 1090
1078 for (@$files) { 1091 for (@$files) {
1079 utf8::decode $_; 1092 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1093 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1094 next unless /^$PATH_SEP/o;
1082 1095
1083 s/\.map$//; 1096 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1097 }
1086 1098
1087 \@paths 1099 \@paths
1088} 1100}
1089 1101
1178sub normalise { 1190sub normalise {
1179 my ($path, $base) = @_; 1191 my ($path, $base) = @_;
1180 1192
1181 $path = "$path"; # make sure its a string 1193 $path = "$path"; # make sure its a string
1182 1194
1195 $path =~ s/\.map$//;
1196
1183 # map plan: 1197 # map plan:
1184 # 1198 #
1185 # /! non-realised random map exit (special hack!) 1199 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1200 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1201 # ?xxx/... are special absolute paths
1248 1262
1249# the original (read-only) location 1263# the original (read-only) location
1250sub load_path { 1264sub load_path {
1251 my ($self) = @_; 1265 my ($self) = @_;
1252 1266
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1267 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1268}
1255 1269
1256# the temporary/swap location 1270# the temporary/swap location
1257sub save_path { 1271sub save_path {
1258 my ($self) = @_; 1272 my ($self) = @_;
1259 1273
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1274 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1275 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1276}
1263 1277
1264# the unique path, undef == no special unique path 1278# the unique path, undef == no special unique path
1265sub uniq_path { 1279sub uniq_path {
1266 my ($self) = @_; 1280 my ($self) = @_;
1282 my ($self) = @_; 1296 my ($self) = @_;
1283 1297
1284 utf8::encode (my $save = $self->save_path); 1298 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1299 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1300 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1301
1302 #d#TODO remove .map and also nuke
1303 $save =~ s/\.map// or return;#d#
1304 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1305 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1287} 1306}
1288 1307
1289sub load_header_from($) { 1308sub load_header_from($) {
1290 my ($self, $path) = @_; 1309 my ($self, $path) = @_;
1291 1310
1292 utf8::encode $path; 1311 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1312 #aio_open $path, O_RDONLY, 0
1294 or return; 1313 # or return;
1295 1314
1296 $self->_load_header ($path) 1315 $self->_load_header ($path)
1297 or return; 1316 or return;
1298 1317
1299 $self->{load_path} = $path; 1318 $self->{load_path} = $path;
1362 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1363 1382
1364 $map->load_header 1383 $map->load_header
1365 or return; 1384 or return;
1366 1385
1367 if ($map->should_reset) { 1386 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously 1387 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait; 1388 #$cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1389 $map->reset;
1371 undef $guard; 1390 undef $guard;
1372 return find $path; 1391 return find $path;
1379sub pre_load { } 1398sub pre_load { }
1380sub post_load { } 1399sub post_load { }
1381 1400
1382sub load { 1401sub load {
1383 my ($self) = @_; 1402 my ($self) = @_;
1403
1404 local $self->{deny_reset} = 1; # loading can take a long time
1384 1405
1385 my $path = $self->{path}; 1406 my $path = $self->{path};
1386 my $guard = cf::lock_acquire "map_load:$path"; 1407 my $guard = cf::lock_acquire "map_load:$path";
1387 1408
1388 return if $self->in_memory != cf::MAP_SWAPPED; 1409 return if $self->in_memory != cf::MAP_SWAPPED;
1626 for (@$files) { 1647 for (@$files) {
1627 utf8::decode $_; 1648 utf8::decode $_;
1628 next if /\.pst$/; 1649 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1650 next unless /^$PATH_SEP/o;
1630 1651
1631 s/\.map$//; 1652 push @paths, cf::map::normalise $_;
1632 push @paths, $_;
1633 } 1653 }
1634 1654
1635 \@paths 1655 \@paths
1636} 1656}
1637 1657
1731=cut 1751=cut
1732 1752
1733sub link_map { 1753sub link_map {
1734 unless ($LINK_MAP) { 1754 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 1755 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1756 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 1757 $LINK_MAP->load;
1738 } 1758 }
1739 1759
1740 $LINK_MAP 1760 $LINK_MAP
1741} 1761}
1825 my ($self, $path, $x, $y) = @_; 1845 my ($self, $path, $x, $y) = @_;
1826 1846
1827 $self->enter_link; 1847 $self->enter_link;
1828 1848
1829 (async { 1849 (async {
1850 my $map = eval {
1830 my $map = cf::map::find $path; 1851 my $map = cf::map::find $path;
1831 $map = $map->customise_for ($self) if $map; 1852 $map = $map->customise_for ($self) if $map;
1832 1853 $map
1833# warn "entering ", $map->path, " at ($x, $y)\n" 1854 } or
1834# if $map;
1835
1836 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1855 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1837 1856
1838 $self->leave_link ($map, $x, $y); 1857 $self->leave_link ($map, $x, $y);
1839 })->prio (1); 1858 })->prio (1);
1840} 1859}
1841 1860
1872 # that depends on the exit object 1891 # that depends on the exit object
1873 1892
1874 my $rmp = parse_random_map_params $exit->msg; 1893 my $rmp = parse_random_map_params $exit->msg;
1875 1894
1876 if ($exit->map) { 1895 if ($exit->map) {
1877 $rmp->{region} = $exit->map->region_name; 1896 $rmp->{region} = $exit->region->name;
1878 $rmp->{origin_map} = $exit->map->path; 1897 $rmp->{origin_map} = $exit->map->path;
1879 $rmp->{origin_x} = $exit->x; 1898 $rmp->{origin_x} = $exit->x;
1880 $rmp->{origin_y} = $exit->y; 1899 $rmp->{origin_y} = $exit->y;
1881 } 1900 }
1882 1901
1899sub cf::object::player::enter_exit { 1918sub cf::object::player::enter_exit {
1900 my ($self, $exit) = @_; 1919 my ($self, $exit) = @_;
1901 1920
1902 return unless $self->type == cf::PLAYER; 1921 return unless $self->type == cf::PLAYER;
1903 1922
1923 if ($exit->slaying eq "/!") {
1924 #TODO: this should de-fi-ni-te-ly not be a sync-job
1925 cf::sync_job { prepare_random_map $exit };
1926 }
1927
1928 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1929 my $hp = $exit->stats->hp;
1930 my $sp = $exit->stats->sp;
1931
1904 $self->enter_link; 1932 $self->enter_link;
1905 1933
1906 (async { 1934 (async {
1907 $self->deactivate_recursive; # just to be sure 1935 $self->deactivate_recursive; # just to be sure
1908 unless (eval { 1936 unless (eval {
1909 prepare_random_map $exit 1937 $self->goto ($slaying, $hp, $sp);
1910 if $exit->slaying eq "/!";
1911
1912 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1913 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1914 1938
1915 1; 1939 1;
1916 }) { 1940 }) {
1917 $self->message ("Something went wrong deep within the crossfire server. " 1941 $self->message ("Something went wrong deep within the crossfire server. "
1918 . "I'll try to bring you back to the map you were before. " 1942 . "I'll try to bring you back to the map you were before. "

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines