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.165 by root, Fri Jan 12 22:09:22 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

… …
54our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 55our $RUNTIME;
56 56
57our %PLAYER; # all users 57our %PLAYER; # all users
58our %MAP; # all maps 58our %MAP; # all maps
59our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
61 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64
65# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
64 67
65binmode STDOUT; 68binmode STDOUT;
66binmode STDERR; 69binmode STDERR;
67 70
68# read virtual server time, if available 71# read virtual server time, if available
… …
76mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
77mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
80 83
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 84our $EMERGENCY_POSITION;
84 85
85############################################################################# 86#############################################################################
86 87
87=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
… …
337 338
338 $coro 339 $coro
339} 340}
340 341
341sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
342 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
343 346
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
345 or return; 348 or return;
346 349
… …
361} 364}
362 365
363=back 366=back
364 367
365=cut 368=cut
366
367#############################################################################
368
369package cf::path;
370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
383sub new {
384 my ($class, $path, $base) = @_;
385
386 return $path if ref $path;
387
388 my $self = {};
389
390 # {... are special paths that are not being touched
391 # ?xxx/... are special absolute paths
392 # ?random/... random maps
393 # /! non-realised random map exit
394 # /... normal maps
395 # ~/... per-player maps without a specific player (DO NOT USE)
396 # ~user/... per-player map of a specific user
397
398 $path =~ s/$PATH_SEP/\//go;
399
400 if ($path =~ /^{/) {
401 # fine as it is
402 } else {
403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
405 $self->{user_rel} = 1;
406
407 if (defined $1) {
408 $self->{user} = $1;
409 } elsif ($base =~ m{^~([^/]+)/}) {
410 $self->{user} = $1;
411 } else {
412 warn "cannot resolve user-relative path without user <$path,$base>\n";
413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
420 } elsif ($path =~ /^\//) {
421 # /...
422 # already absolute
423 } else {
424 # relative
425 $base =~ s{[^/]+/?$}{};
426 return $class->new ("$base/$path");
427 }
428
429 for ($path) {
430 redo if s{/\.?/}{/};
431 redo if s{/[^/]+/\.\./}{/};
432 }
433 }
434
435 $self->{path} = $path;
436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
458}
459
460# the name / primary key / in-game path
461sub as_string {
462 my ($self) = @_;
463
464 $self->{user_rel} ? "~$self->{user}$self->{path}"
465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
466 : $self->{path}
467}
468
469# the displayed name, this is a one way mapping
470sub visible_name {
471 &as_string
472}
473
474# escape the /'s in the path
475sub _escaped_path {
476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
478 $path
479}
480
481# the original (read-only) location
482sub load_path {
483 my ($self) = @_;
484
485 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
486}
487
488# the temporary/swap location
489sub save_path {
490 my ($self) = @_;
491
492 $self->{user_rel}
493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
495}
496
497# the unique path, undef == no special unique path
498sub uniq_path {
499 my ($self) = @_;
500
501 $self->{user_rel} || $self->{ext}
502 ? undef
503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
504}
505
506sub customise_for {
507 my ($self, $map, $ob) = @_;
508
509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
514}
515
516# this is somewhat ugly, but style maps do need special treatment
517sub is_style_map {
518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
539}
540
541package cf;
542 369
543############################################################################# 370#############################################################################
544 371
545=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
546 373
… …
1048 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
1049 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
1050 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
1051 . "\n};\n1"; 878 . "\n};\n1";
1052 879
1053 eval $source 880 unless (eval $source) {
1054 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
1055 : "extension disabled.\n"; 882 : "extension disabled.\n";
883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
884 warn $@;
885 warn "mandatory extension failed to load, exiting.\n";
886 exit 1;
887 }
888 die $@;
889 }
1056 890
1057 push @EXTS, $pkg; 891 push @EXTS, $pkg;
1058} 892}
1059 893
1060sub load_extensions { 894sub load_extensions {
… …
1066 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
1067 } 901 }
1068} 902}
1069 903
1070############################################################################# 904#############################################################################
1071# load/save/clean perl data associated with a map
1072
1073*cf::mapsupport::on_clean = sub {
1074 my ($map) = @_;
1075
1076 my $path = $map->tmpname;
1077 defined $path or return;
1078
1079 unlink "$path.pst";
1080};
1081
1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1083
1084#############################################################################
1085 905
1086=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1087 907
1088Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1089 909
… …
1225 \@logins 1045 \@logins
1226} 1046}
1227 1047
1228=item $player->maps 1048=item $player->maps
1229 1049
1230Returns an arrayref of cf::path's of all maps that are private for this 1050Returns an arrayref of map paths that are private for this
1231player. May block. 1051player. May block.
1232 1052
1233=cut 1053=cut
1234 1054
1235sub maps($) { 1055sub maps($) {
… …
1243 for (@$files) { 1063 for (@$files) {
1244 utf8::decode $_; 1064 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1065 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1066 next unless /^$PATH_SEP/o;
1247 1067
1068 s/\.map$//;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1070 }
1250 1071
1251 \@paths 1072 \@paths
1252} 1073}
1253 1074
… …
1279package cf::map; 1100package cf::map;
1280 1101
1281use Fcntl; 1102use Fcntl;
1282use Coro::AIO; 1103use Coro::AIO;
1283 1104
1105use overload
1106 '""' => \&as_string;
1107
1284our $MAX_RESET = 3600; 1108our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1109our $DEFAULT_RESET = 3000;
1286 1110
1287sub generate_random_map { 1111sub generate_random_map {
1288 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1289 1113
1290 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1115 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1126 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1127 )
1305} 1128}
1306 1129
1130sub register {
1131 my (undef, $regex) = @_;
1132 my $pkg = caller;
1133
1134 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__;
1136
1137 $EXT_MAP{$pkg} = qr<$regex>;
1138}
1139
1140# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)};
1142
1143sub normalise {
1144 my ($path, $base) = @_;
1145
1146 # map plan:
1147 #
1148 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched
1150 # ?xxx/... are special absolute paths
1151 # ?random/... random maps
1152 # /... normal maps
1153 # ~user/... per-player map of a specific user
1154
1155 $path =~ s/$PATH_SEP/\//go;
1156
1157 # treat it as relative path if it starts with
1158 # something that looks reasonable
1159 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1160 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1161
1162 $base =~ s{[^/]+/?$}{};
1163 $path = "$base/$path";
1164 }
1165
1166 for ($path) {
1167 redo if s{//}{/};
1168 redo if s{/\.?/}{/};
1169 redo if s{/[^/]+/\.\./}{/};
1170 }
1171
1172 $path
1173}
1174
1175sub new_from_path {
1176 my (undef, $path, $base) = @_;
1177
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179
1180 $path = normalise $path, $base;
1181
1182 for my $pkg (keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) {
1184 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc.
1187 return $self;
1188 }
1189 }
1190
1191 Carp::carp "unable to resolve path '$path'.";
1192 ()
1193}
1194
1195sub init {
1196 my ($self) = @_;
1197
1198 $self
1199}
1200
1201sub as_string {
1202 my ($self) = @_;
1203
1204 "$self->{path}"
1205}
1206
1207# the displayed name, this is a one way mapping
1208sub visible_name {
1209 &as_string
1210}
1211
1212# the original (read-only) location
1213sub load_path {
1214 my ($self) = @_;
1215
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1217}
1218
1219# the temporary/swap location
1220sub save_path {
1221 my ($self) = @_;
1222
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1225}
1226
1227# the unique path, undef == no special unique path
1228sub uniq_path {
1229 my ($self) = @_;
1230
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1233}
1234
1307# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1308# all maps in C++... 1236# all maps in C++...
1309sub change_all_map_light { 1237sub change_all_map_light {
1310 my ($change) = @_; 1238 my ($change) = @_;
1311 1239
1312 $_->change_map_light ($change) 1240 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1241 for grep $_->outdoor, values %cf::MAP;
1314} 1242}
1315 1243
1244sub unlink_save {
1245 my ($self) = @_;
1246
1247 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1250}
1251
1316sub load_map_header($) { 1252sub load_header_from($) {
1317 my ($path) = @_; 1253 my ($self, $path) = @_;
1318 1254
1319 utf8::encode $path; 1255 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1321 or return; 1257 or return;
1322 1258
1323 my $map = cf::map::new 1259 $self->_load_header ($path)
1324 or return; 1260 or return;
1325 1261
1326 # for better error messages only, will be overwritten later 1262 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1263
1329 $map->load_header ($path) 1264 1
1265}
1266
1267sub load_orig {
1268 my ($self) = @_;
1269
1270 $self->load_header_from ($self->load_path)
1271}
1272
1273sub load_temp {
1274 my ($self) = @_;
1275
1276 $self->load_header_from ($self->save_path)
1277}
1278
1279sub load_header {
1280 my ($self) = @_;
1281
1282 if ($self->load_temp) {
1283 $self->last_access ((delete $self->{last_access})
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else {
1289 $self->load_orig
1330 or return; 1290 or return;
1331 1291
1332 $map->{load_path} = $path; 1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 }
1333 1297
1334 $map 1298 1
1335} 1299}
1336 1300
1337sub find; 1301sub find;
1338sub find { 1302sub find {
1339 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1340 1304
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1306
1346 cf::lock_wait "map_find:$key"; 1307 cf::lock_wait "map_find:$path";
1347 1308
1348 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1310 my $guard = cf::lock_acquire "map_find:$path";
1350 1311 my $map = new_from_path cf::map $path
1351 # do it the slow way
1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1355
1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1359 # safety
1360 $map->{instantiate_time} = $cf::RUNTIME
1361 if $map->{instantiate_time} > $cf::RUNTIME;
1362 } else {
1363 $map = $path->load_orig
1364 or return; 1312 or return;
1365 1313
1366 $map->{load_original} = 1;
1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1369 $map->instantiate;
1370
1371 # per-player maps become, after loading, normal maps
1372 $map->per_player (0) if $path->{user_rel};
1373 }
1374
1375 $map->path ($key);
1376 $map->{path} = $path;
1377 $map->{last_save} = $cf::RUNTIME; 1314 $map->{last_save} = $cf::RUNTIME;
1378 1315
1379 Coro::cede; 1316 $map->load_header
1317 or return;
1380 1318
1381 if ($map->should_reset) { 1319 if ($map->should_reset) {
1382 $map->reset; 1320 $map->reset;
1383 undef $guard; 1321 undef $guard;
1384 $map = find $path 1322 $map = find $path
1385 or return; 1323 or return;
1386 } 1324 }
1387 1325
1388 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1389 } 1327 }
1390} 1328}
1391 1329
1392sub load { 1330sub load {
1393 my ($self) = @_; 1331 my ($self) = @_;
1394 1332
1395 my $path = $self->{path}; 1333 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1334 my $guard = cf::lock_acquire "map_load:$path";
1397 1335
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1337
1400 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1401 1339
1402 $self->alloc; 1340 $self->alloc;
1403 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1342 or return;
1405 1343
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1408 1346
1409 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1348 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1350 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1414 } 1352 }
1415 } 1353 }
1416 1354
1417 Coro::cede; 1355 Coro::cede;
1418 1356
1419 # now do the right thing for maps 1357 # now do the right thing for maps
1420 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1421 1359
1422 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1361 $self->decay_objects;
1427 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1428 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1429 $self->set_darkness_map; 1365 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1432 $self->activate; 1369 $self->activate;
1433 } 1370 }
1434 1371
1435 Coro::cede;
1436
1437 $self->in_memory (cf::MAP_IN_MEMORY); 1372 $self->in_memory (cf::MAP_IN_MEMORY);
1373}
1374
1375sub customise_for {
1376 my ($self, $ob) = @_;
1377
1378 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player;
1380
1381 $self
1438} 1382}
1439 1383
1440# find and load all maps in the 3x3 area around a map 1384# find and load all maps in the 3x3 area around a map
1441sub load_diag { 1385sub load_diag {
1442 my ($map) = @_; 1386 my ($map) = @_;
… …
1474} 1418}
1475 1419
1476our %MAP_PREFETCH; 1420our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1421our $MAP_PREFETCHER = Coro::async {
1478 while () { 1422 while () {
1479 while (%MAP_PREFETCH) { 1423 for my $path (keys %MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path 1424 my $map = find $path
1485 or next; 1425 or next;
1486 $map->load; 1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1487 } 1429 }
1488 Coro::schedule; 1430 Coro::schedule;
1489 } 1431 }
1490}; 1432};
1491 1433
1492sub find_async { 1434sub find_async {
1493 my ($path, $origin) = @_; 1435 my ($path, $origin) = @_;
1494 1436
1495 $path = new cf::path $path, $origin && $origin->path; 1437 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1438
1498 if (my $map = $cf::MAP{$key}) { 1439 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1441 }
1501 1442
1502 $MAP_PREFETCH{$key} = $path; 1443 $MAP_PREFETCH{$path} = 0;
1503 $MAP_PREFETCHER->ready; 1444 $MAP_PREFETCHER->ready;
1504 1445
1505 () 1446 ()
1506} 1447}
1507 1448
… …
1512 1453
1513 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1514 1455
1515 return unless $self->dirty; 1456 return unless $self->dirty;
1516 1457
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1458 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1460
1520 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1521 1462
1522 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1523 1464
… …
1526 cf::async { 1467 cf::async {
1527 $_->contr->save for $self->players; 1468 $_->contr->save for $self->players;
1528 }; 1469 };
1529 1470
1530 if ($uniq) { 1471 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1474 } else {
1534 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1475 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1535 } 1476 }
1536} 1477}
1537 1478
1538sub swap_out { 1479sub swap_out {
1539 my ($self) = @_; 1480 my ($self) = @_;
… …
1553 1494
1554sub reset_at { 1495sub reset_at {
1555 my ($self) = @_; 1496 my ($self) = @_;
1556 1497
1557 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1559 return 1e99 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1560 1501
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1563 1504
… …
1571} 1512}
1572 1513
1573sub rename { 1514sub rename {
1574 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1575 1516
1517 normalise $new_path;
1518
1576 $self->{path}->unlink_save; 1519 $self->unlink_save;
1577 1520
1578 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1582 1524
1583 $self->save; 1525 $self->save;
1584} 1526}
1585 1527
1586sub reset { 1528sub reset {
1587 my ($self) = @_; 1529 my ($self) = @_;
1588 1530
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1590 1532
1591 return if $self->players; 1533 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1593 1535
1594 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1595 1537
1596 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1597 1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1542
1598 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1599 1544
1600 $self->{path}->unlink_save; 1545 $self->unlink_save;
1601 $self->destroy; 1546 $self->destroy;
1602} 1547}
1603 1548
1604my $nuke_counter = "aaaa"; 1549my $nuke_counter = "aaaa";
1605 1550
… …
1612 $self->reset; # polite request, might not happen 1557 $self->reset; # polite request, might not happen
1613} 1558}
1614 1559
1615=item cf::map::unique_maps 1560=item cf::map::unique_maps
1616 1561
1617Returns an arrayref of cf::path's of all shared maps that have 1562Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1563instantiated unique items. May block.
1619 1564
1620=cut 1565=cut
1621 1566
1622sub unique_maps() { 1567sub unique_maps() {
… …
1628 for (@$files) { 1573 for (@$files) {
1629 utf8::decode $_; 1574 utf8::decode $_;
1630 next if /\.pst$/; 1575 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1576 next unless /^$PATH_SEP/o;
1632 1577
1578 s/\.map$//;
1633 push @paths, new cf::path $_; 1579 push @paths, $_;
1634 } 1580 }
1635 1581
1636 \@paths 1582 \@paths
1637} 1583}
1638 1584
… …
1713 1659
1714=item $player_object->enter_link 1660=item $player_object->enter_link
1715 1661
1716Freezes the player and moves him/her to a special map (C<{link}>). 1662Freezes the player and moves him/her to a special map (C<{link}>).
1717 1663
1718The player should be reaosnably safe there for short amounts of time. You 1664The player should be reasonably safe there for short amounts of time. You
1719I<MUST> call C<leave_link> as soon as possible, though. 1665I<MUST> call C<leave_link> as soon as possible, though.
1720 1666
1667Will never block.
1668
1721=item $player_object->leave_link ($map, $x, $y) 1669=item $player_object->leave_link ($map, $x, $y)
1722 1670
1723Moves the player out of the specila link map onto the given map. If the 1671Moves the player out of the special C<{link}> map onto the specified
1724map is not valid (or omitted), the player will be moved back to the 1672map. If the map is not valid (or omitted), the player will be moved back
1725location he/she was before the call to C<enter_link>, or, if that fails, 1673to the location he/she was before the call to C<enter_link>, or, if that
1726to the emergency map position. 1674fails, to the emergency map position.
1727 1675
1728Might block. 1676Might block.
1729 1677
1730=cut 1678=cut
1679
1680sub link_map {
1681 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1684 $LINK_MAP->load;
1685 }
1686
1687 $LINK_MAP
1688}
1731 1689
1732sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1733 my ($self) = @_; 1691 my ($self) = @_;
1734 1692
1735 $self->deactivate_recursive; 1693 $self->deactivate_recursive;
1736 1694
1737 return if $self->map == $LINK_MAP; 1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1696
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1698 if $self->map;
1741 1699
1742 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1743} 1701}
1744 1702
1745sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1747 1705
… …
1811=cut 1769=cut
1812 1770
1813sub cf::object::player::goto { 1771sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1815 1773
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1774 $self->enter_link;
1819 1775
1820 (async { 1776 (async {
1821 my $map = cf::map::find $path->as_string; 1777 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1823 1779
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1825# if $map; 1781# if $map;
1826 1782
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
… …
1891 $self->deactivate_recursive; # just to be sure 1847 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1848 unless (eval {
1893 prepare_random_map $exit 1849 prepare_random_map $exit
1894 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1895 1851
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1854
1899 1; 1855 1;
1900 }) { 1856 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
… …
2284 warn "enter emergency perl save\n"; 2240 warn "enter emergency perl save\n";
2285 2241
2286 cf::sync_job { 2242 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl 2243 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players 2244 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously. 2245 # and maps saved/destroyed asynchronously.
2290 warn "begin emergency player save\n"; 2246 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) { 2247 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next; 2248 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next; 2249 $pl->valid or next;
2294 $pl->save; 2250 $pl->save;
… …
2408 exit 1; 2364 exit 1;
2409 } 2365 }
2410 2366
2411 warn "reloaded"; 2367 warn "reloaded";
2412}; 2368};
2413
2414#############################################################################
2415
2416unless ($LINK_MAP) {
2417 $LINK_MAP = cf::map::new;
2418
2419 $LINK_MAP->width (41);
2420 $LINK_MAP->height (41);
2421 $LINK_MAP->alloc;
2422 $LINK_MAP->path ("{link}");
2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2425
2426 # dirty hack because... archetypes are not yet loaded
2427 Event->timer (
2428 after => 10,
2429 cb => sub {
2430 $_[0]->w->cancel;
2431
2432 # provide some exits "home"
2433 my $exit = cf::object::new "exit";
2434
2435 $exit->slaying ($EMERGENCY_POSITION->[0]);
2436 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2437 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2438
2439 $LINK_MAP->insert ($exit->clone, 19, 19);
2440 $LINK_MAP->insert ($exit->clone, 19, 20);
2441 $LINK_MAP->insert ($exit->clone, 19, 21);
2442 $LINK_MAP->insert ($exit->clone, 20, 19);
2443 $LINK_MAP->insert ($exit->clone, 20, 21);
2444 $LINK_MAP->insert ($exit->clone, 21, 19);
2445 $LINK_MAP->insert ($exit->clone, 21, 20);
2446 $LINK_MAP->insert ($exit->clone, 21, 21);
2447
2448 $exit->destroy;
2449 });
2450
2451 $LINK_MAP->{deny_save} = 1;
2452 $LINK_MAP->{deny_reset} = 1;
2453
2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2455}
2456 2369
2457register_command "reload" => sub { 2370register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2459 2372
2460 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {

Diff Legend

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