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.166 by root, Sat Jan 13 23:06:13 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 {
… …
1225 \@logins 1059 \@logins
1226} 1060}
1227 1061
1228=item $player->maps 1062=item $player->maps
1229 1063
1230Returns an arrayref of cf::path's of all maps that are private for this 1064Returns an arrayref of map paths that are private for this
1231player. May block. 1065player. May block.
1232 1066
1233=cut 1067=cut
1234 1068
1235sub maps($) { 1069sub maps($) {
… …
1243 for (@$files) { 1077 for (@$files) {
1244 utf8::decode $_; 1078 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/; 1079 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o; 1080 next unless /^$PATH_SEP/o;
1247 1081
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1082 push @paths, "~" . $pl->ob->name . "/" . $_;
1249 } 1083 }
1250 1084
1251 \@paths 1085 \@paths
1252} 1086}
1253 1087
… …
1279package cf::map; 1113package cf::map;
1280 1114
1281use Fcntl; 1115use Fcntl;
1282use Coro::AIO; 1116use Coro::AIO;
1283 1117
1118use overload
1119 '""' => \&as_string;
1120
1284our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1286 1123
1287sub generate_random_map { 1124sub generate_random_map {
1288 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1289 1126
1290 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map ( 1128 $self->_create_random_map (
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
… …
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region}), $rmp->{custom} 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 ) 1140 )
1305} 1141}
1306 1142
1143sub register {
1144 my (undef, $regex) = @_;
1145 my $pkg = caller;
1146
1147 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__;
1149
1150 $EXT_MAP{$pkg} = qr<$regex>;
1151}
1152
1153# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155
1156sub normalise {
1157 my ($path, $base) = @_;
1158
1159 # map plan:
1160 #
1161 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched
1163 # ?xxx/... are special absolute paths
1164 # ?random/... random maps
1165 # /... normal maps
1166 # ~user/... per-player map of a specific user
1167
1168 $path =~ s/$PATH_SEP/\//go;
1169
1170 # treat it as relative path if it starts with
1171 # something that looks reasonable
1172 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1173 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1174
1175 $base =~ s{[^/]+/?$}{};
1176 $path = "$base/$path";
1177 }
1178
1179 for ($path) {
1180 redo if s{//}{/};
1181 redo if s{/\.?/}{/};
1182 redo if s{/[^/]+/\.\./}{/};
1183 }
1184
1185 $path
1186}
1187
1188sub new_from_path {
1189 my (undef, $path, $base) = @_;
1190
1191 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1192
1193 $path = normalise $path, $base;
1194
1195 for my $pkg (keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) {
1197 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc.
1200 return $self;
1201 }
1202 }
1203
1204 Carp::carp "unable to resolve path '$path'.";
1205 ()
1206}
1207
1208sub init {
1209 my ($self) = @_;
1210
1211 $self
1212}
1213
1214sub as_string {
1215 my ($self) = @_;
1216
1217 "$self->{path}"
1218}
1219
1220# the displayed name, this is a one way mapping
1221sub visible_name {
1222 &as_string
1223}
1224
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location
1233sub load_path {
1234 my ($self) = @_;
1235
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1237}
1238
1239# the temporary/swap location
1240sub save_path {
1241 my ($self) = @_;
1242
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path
1244}
1245
1246# the unique path, undef == no special unique path
1247sub uniq_path {
1248 my ($self) = @_;
1249
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
1251}
1252
1307# and all this just because we cannot iterate over 1253# and all this just because we cannot iterate over
1308# all maps in C++... 1254# all maps in C++...
1309sub change_all_map_light { 1255sub change_all_map_light {
1310 my ($change) = @_; 1256 my ($change) = @_;
1311 1257
1312 $_->change_map_light ($change) 1258 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP; 1259 for grep $_->outdoor, values %cf::MAP;
1314} 1260}
1315 1261
1262sub unlink_save {
1263 my ($self) = @_;
1264
1265 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1268}
1269
1316sub load_map_header($) { 1270sub load_header_from($) {
1317 my ($path) = @_; 1271 my ($self, $path) = @_;
1318 1272
1319 utf8::encode $path; 1273 utf8::encode $path;
1320 aio_open $path, O_RDONLY, 0 1274 aio_open $path, O_RDONLY, 0
1321 or return; 1275 or return;
1322 1276
1323 my $map = cf::map::new 1277 $self->_load_header ($path)
1324 or return; 1278 or return;
1325 1279
1326 # for better error messages only, will be overwritten later 1280 $self->{load_path} = $path;
1327 $map->path ($path);
1328 1281
1329 $map->load_header ($path) 1282 1
1283}
1284
1285sub load_orig {
1286 my ($self) = @_;
1287
1288 $self->load_header_from ($self->load_path)
1289}
1290
1291sub load_temp {
1292 my ($self) = @_;
1293
1294 $self->load_header_from ($self->save_path)
1295}
1296
1297sub load_header {
1298 my ($self) = @_;
1299
1300 if ($self->load_temp) {
1301 $self->last_access ((delete $self->{last_access})
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else {
1307 $self->load_orig
1330 or return; 1308 or return;
1331 1309
1332 $map->{load_path} = $path; 1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 }
1333 1315
1334 $map 1316 1
1335} 1317}
1336 1318
1337sub find; 1319sub find;
1338sub find { 1320sub find {
1339 my ($path, $origin) = @_; 1321 my ($path, $origin) = @_;
1340 1322
1341 #warn "find<$path,$origin>\n";#d#
1342
1343 $path = new cf::path $path, $origin && $origin->path; 1323 $path = normalise $path, $origin && $origin->path;
1344 my $key = $path->as_string;
1345 1324
1346 cf::lock_wait "map_find:$key"; 1325 cf::lock_wait "map_find:$path";
1347 1326
1348 $cf::MAP{$key} || do { 1327 $cf::MAP{$path} || do {
1349 my $guard = cf::lock_acquire "map_find:$key"; 1328 my $guard = cf::lock_acquire "map_find:$path";
1350 1329 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; 1330 or return;
1365 1331
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; 1332 $map->{last_save} = $cf::RUNTIME;
1378 1333
1379 Coro::cede; 1334 $map->load_header
1335 or return;
1380 1336
1381 if ($map->should_reset) { 1337 if ($map->should_reset) {
1382 $map->reset; 1338 $map->reset;
1383 undef $guard; 1339 undef $guard;
1384 $map = find $path 1340 $map = find $path
1385 or return; 1341 or return;
1386 } 1342 }
1387 1343
1388 $cf::MAP{$key} = $map 1344 $cf::MAP{$path} = $map
1389 } 1345 }
1390} 1346}
1391 1347
1392sub load { 1348sub load {
1393 my ($self) = @_; 1349 my ($self) = @_;
1394 1350
1395 my $path = $self->{path}; 1351 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1352 my $guard = cf::lock_acquire "map_load:$path";
1397 1353
1398 return if $self->in_memory != cf::MAP_SWAPPED; 1354 return if $self->in_memory != cf::MAP_SWAPPED;
1399 1355
1400 $self->in_memory (cf::MAP_LOADING); 1356 $self->in_memory (cf::MAP_LOADING);
1401 1357
1402 $self->alloc; 1358 $self->alloc;
1403 $self->load_objects ($self->{load_path}, 1) 1359 $self->_load_objects ($self->{load_path}, 1)
1404 or return; 1360 or return;
1405 1361
1406 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1407 if delete $self->{load_original}; 1363 if delete $self->{load_original};
1408 1364
1409 if (my $uniq = $path->uniq_path) { 1365 if (my $uniq = $self->uniq_path) {
1410 utf8::encode $uniq; 1366 utf8::encode $uniq;
1411 if (aio_open $uniq, O_RDONLY, 0) { 1367 if (aio_open $uniq, O_RDONLY, 0) {
1412 $self->clear_unique_items; 1368 $self->clear_unique_items;
1413 $self->load_objects ($uniq, 0); 1369 $self->_load_objects ($uniq, 0);
1414 } 1370 }
1415 } 1371 }
1416 1372
1417 Coro::cede; 1373 Coro::cede;
1418 1374
1419 # now do the right thing for maps 1375 # now do the right thing for maps
1420 $self->link_multipart_objects; 1376 $self->link_multipart_objects;
1421 1377
1422 if ($self->{path}->is_style_map) { 1378 unless ($self->{deny_activate}) {
1423 $self->{deny_save} = 1;
1424 $self->{deny_reset} = 1;
1425 } else {
1426 $self->decay_objects; 1379 $self->decay_objects;
1427 $self->fix_auto_apply; 1380 $self->fix_auto_apply;
1428 $self->update_buttons; 1381 $self->update_buttons;
1382 Coro::cede;
1429 $self->set_darkness_map; 1383 $self->set_darkness_map;
1430 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1431 unless $self->difficulty; 1385 unless $self->difficulty;
1386 Coro::cede;
1432 $self->activate; 1387 $self->activate;
1433 } 1388 }
1434 1389
1435 Coro::cede;
1436
1437 $self->in_memory (cf::MAP_IN_MEMORY); 1390 $self->in_memory (cf::MAP_IN_MEMORY);
1391}
1392
1393sub customise_for {
1394 my ($self, $ob) = @_;
1395
1396 return find "~" . $ob->name . "/" . $self->{path}
1397 if $self->per_player;
1398
1399 $self
1438} 1400}
1439 1401
1440# find and load all maps in the 3x3 area around a map 1402# find and load all maps in the 3x3 area around a map
1441sub load_diag { 1403sub load_diag {
1442 my ($map) = @_; 1404 my ($map) = @_;
… …
1474} 1436}
1475 1437
1476our %MAP_PREFETCH; 1438our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async { 1439our $MAP_PREFETCHER = Coro::async {
1478 while () { 1440 while () {
1479 while (%MAP_PREFETCH) { 1441 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 1442 my $map = find $path
1485 or next; 1443 or next;
1486 $map->load; 1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1487 } 1447 }
1488 Coro::schedule; 1448 Coro::schedule;
1489 } 1449 }
1490}; 1450};
1491 1451
1492sub find_async { 1452sub find_async {
1493 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1494 1454
1495 $path = new cf::path $path, $origin && $origin->path; 1455 $path = normalise $path, $origin && $origin->{path};
1496 my $key = $path->as_string;
1497 1456
1498 if (my $map = $cf::MAP{$key}) { 1457 if (my $map = $cf::MAP{$path}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 } 1459 }
1501 1460
1502 $MAP_PREFETCH{$key} = $path; 1461 $MAP_PREFETCH{$path} = 0;
1503 $MAP_PREFETCHER->ready; 1462 $MAP_PREFETCHER->ready;
1504 1463
1505 () 1464 ()
1506} 1465}
1507 1466
… …
1512 1471
1513 $self->{last_save} = $cf::RUNTIME; 1472 $self->{last_save} = $cf::RUNTIME;
1514 1473
1515 return unless $self->dirty; 1474 return unless $self->dirty;
1516 1475
1517 my $save = $self->{path}->save_path; utf8::encode $save; 1476 my $save = $self->save_path; utf8::encode $save;
1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1477 my $uniq = $self->uniq_path; utf8::encode $uniq;
1519 1478
1520 $self->{load_path} = $save; 1479 $self->{load_path} = $save;
1521 1480
1522 return if $self->{deny_save}; 1481 return if $self->{deny_save};
1523 1482
… …
1526 cf::async { 1485 cf::async {
1527 $_->contr->save for $self->players; 1486 $_->contr->save for $self->players;
1528 }; 1487 };
1529 1488
1530 if ($uniq) { 1489 if ($uniq) {
1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1490 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1532 $self->save_objects ($uniq, cf::IO_UNIQUES); 1491 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1533 } else { 1492 } else {
1534 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1493 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1535 } 1494 }
1536} 1495}
1537 1496
1538sub swap_out { 1497sub swap_out {
1539 my ($self) = @_; 1498 my ($self) = @_;
… …
1553 1512
1554sub reset_at { 1513sub reset_at {
1555 my ($self) = @_; 1514 my ($self) = @_;
1556 1515
1557 # TODO: safety, remove and allow resettable per-player maps 1516 # TODO: safety, remove and allow resettable per-player maps
1558 return 1e99 if $self->{path}{user_rel}; 1517 return 1e99 if $self->isa ("ext::map_per_player");
1559 return 1e99 if $self->{deny_reset}; 1518 return 1e99 if $self->{deny_reset};
1560 1519
1561 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1562 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1563 1522
… …
1571} 1530}
1572 1531
1573sub rename { 1532sub rename {
1574 my ($self, $new_path) = @_; 1533 my ($self, $new_path) = @_;
1575 1534
1535 normalise $new_path;
1536
1576 $self->{path}->unlink_save; 1537 $self->unlink_save;
1577 1538
1578 delete $cf::MAP{$self->path}; 1539 delete $cf::MAP{$self->path};
1579 $self->{path} = new cf::path $new_path; 1540 $self->{path} = $new_path; $self->path ($self->{path});
1580 $self->path ($self->{path}->as_string);
1581 $cf::MAP{$self->path} = $self; 1541 $cf::MAP{$self->path} = $self;
1582 1542
1583 $self->save; 1543 $self->save;
1584} 1544}
1585 1545
… …
1587 my ($self) = @_; 1547 my ($self) = @_;
1588 1548
1589 my $lock = cf::lock_acquire "map_data:" . $self->path; 1549 my $lock = cf::lock_acquire "map_data:" . $self->path;
1590 1550
1591 return if $self->players; 1551 return if $self->players;
1592 return if $self->{path}{user_rel};#d# 1552 return if $self->isa ("ext::map_per_player");#d#
1593 1553
1594 warn "resetting map ", $self->path;#d# 1554 warn "resetting map ", $self->path;#d#
1595 1555
1596 delete $cf::MAP{$self->path}; 1556 delete $cf::MAP{$self->path};
1597 1557
1598 $_->clear_links_to ($self) for values %cf::MAP; 1558 $_->clear_links_to ($self) for values %cf::MAP;
1599 1559
1600 $self->{path}->unlink_save; 1560 $self->unlink_save;
1601 $self->destroy; 1561 $self->destroy;
1602} 1562}
1603 1563
1604my $nuke_counter = "aaaa"; 1564my $nuke_counter = "aaaa";
1605 1565
… …
1612 $self->reset; # polite request, might not happen 1572 $self->reset; # polite request, might not happen
1613} 1573}
1614 1574
1615=item cf::map::unique_maps 1575=item cf::map::unique_maps
1616 1576
1617Returns an arrayref of cf::path's of all shared maps that have 1577Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 1578instantiated unique items. May block.
1619 1579
1620=cut 1580=cut
1621 1581
1622sub unique_maps() { 1582sub unique_maps() {
… …
1628 for (@$files) { 1588 for (@$files) {
1629 utf8::decode $_; 1589 utf8::decode $_;
1630 next if /\.pst$/; 1590 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1591 next unless /^$PATH_SEP/o;
1632 1592
1633 push @paths, new cf::path $_; 1593 push @paths, $_;
1634 } 1594 }
1635 1595
1636 \@paths 1596 \@paths
1637} 1597}
1638 1598
… …
1713 1673
1714=item $player_object->enter_link 1674=item $player_object->enter_link
1715 1675
1716Freezes the player and moves him/her to a special map (C<{link}>). 1676Freezes the player and moves him/her to a special map (C<{link}>).
1717 1677
1718The player should be reaosnably safe there for short amounts of time. You 1678The player should be reasonably safe there for short amounts of time. You
1719I<MUST> call C<leave_link> as soon as possible, though. 1679I<MUST> call C<leave_link> as soon as possible, though.
1720 1680
1681Will never block.
1682
1721=item $player_object->leave_link ($map, $x, $y) 1683=item $player_object->leave_link ($map, $x, $y)
1722 1684
1723Moves the player out of the specila link map onto the given map. If the 1685Moves 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 1686map. 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, 1687to the location he/she was before the call to C<enter_link>, or, if that
1726to the emergency map position. 1688fails, to the emergency map position.
1727 1689
1728Might block. 1690Might block.
1729 1691
1730=cut 1692=cut
1693
1694sub link_map {
1695 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1698 $LINK_MAP->load;
1699 }
1700
1701 $LINK_MAP
1702}
1731 1703
1732sub cf::object::player::enter_link { 1704sub cf::object::player::enter_link {
1733 my ($self) = @_; 1705 my ($self) = @_;
1734 1706
1735 $self->deactivate_recursive; 1707 $self->deactivate_recursive;
1736 1708
1737 return if $self->map == $LINK_MAP; 1709 return if UNIVERSAL::isa $self->map, "ext::map_link";
1738 1710
1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1740 if $self->map; 1712 if $self->map;
1741 1713
1742 $self->enter_map ($LINK_MAP, 20, 20); 1714 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1743} 1715}
1744 1716
1745sub cf::object::player::leave_link { 1717sub cf::object::player::leave_link {
1746 my ($self, $map, $x, $y) = @_; 1718 my ($self, $map, $x, $y) = @_;
1747 1719
… …
1811=cut 1783=cut
1812 1784
1813sub cf::object::player::goto { 1785sub cf::object::player::goto {
1814 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1815 1787
1816 $path = new cf::path $path;
1817
1818 $self->enter_link; 1788 $self->enter_link;
1819 1789
1820 (async { 1790 (async {
1821 my $map = cf::map::find $path->as_string; 1791 my $map = cf::map::find $path;
1822 $map = $map->{path}->customise_for ($map, $self) if $map; 1792 $map = $map->customise_for ($self) if $map;
1823 1793
1824# warn "entering ", $map->path, " at ($x, $y)\n" 1794# warn "entering ", $map->path, " at ($x, $y)\n"
1825# if $map; 1795# if $map;
1826 1796
1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1797 $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 1861 $self->deactivate_recursive; # just to be sure
1892 unless (eval { 1862 unless (eval {
1893 prepare_random_map $exit 1863 prepare_random_map $exit
1894 if $exit->slaying eq "/!"; 1864 if $exit->slaying eq "/!";
1895 1865
1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1898 1868
1899 1; 1869 1;
1900 }) { 1870 }) {
1901 $self->message ("Something went wrong deep within the crossfire server. " 1871 $self->message ("Something went wrong deep within the crossfire server. "
… …
2408 exit 1; 2378 exit 1;
2409 } 2379 }
2410 2380
2411 warn "reloaded"; 2381 warn "reloaded";
2412}; 2382};
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 2383
2457register_command "reload" => sub { 2384register_command "reload" => sub {
2458 my ($who, $arg) = @_; 2385 my ($who, $arg) = @_;
2459 2386
2460 if ($who->flag (FLAG_WIZ)) { 2387 if ($who->flag (FLAG_WIZ)) {

Diff Legend

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