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.163 by root, Thu Jan 11 01:01:56 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 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
502}
503
504# this is somewhat ugly, but style maps do need special treatment
505sub is_style_map {
506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521package cf;
522 369
523############################################################################# 370#############################################################################
524 371
525=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
526 373
… …
1028 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
1029 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
1030 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
1031 . "\n};\n1"; 878 . "\n};\n1";
1032 879
1033 eval $source 880 unless (eval $source) {
1034 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
1035 : "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 }
1036 890
1037 push @EXTS, $pkg; 891 push @EXTS, $pkg;
1038} 892}
1039 893
1040sub load_extensions { 894sub load_extensions {
… …
1205 \@logins 1059 \@logins
1206} 1060}
1207 1061
1208=item $player->maps 1062=item $player->maps
1209 1063
1210Returns 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
1211player. May block. 1065player. May block.
1212 1066
1213=cut 1067=cut
1214 1068
1215sub maps($) { 1069sub maps($) {
… …
1223 for (@$files) { 1077 for (@$files) {
1224 utf8::decode $_; 1078 utf8::decode $_;
1225 next if /\.(?:pl|pst)$/; 1079 next if /\.(?:pl|pst)$/;
1226 next unless /^$PATH_SEP/o; 1080 next unless /^$PATH_SEP/o;
1227 1081
1228 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1082 push @paths, "~" . $pl->ob->name . "/" . $_;
1229 } 1083 }
1230 1084
1231 \@paths 1085 \@paths
1232} 1086}
1233 1087
… …
1259package cf::map; 1113package cf::map;
1260 1114
1261use Fcntl; 1115use Fcntl;
1262use Coro::AIO; 1116use Coro::AIO;
1263 1117
1118use overload
1119 '""' => \&as_string;
1120
1264our $MAX_RESET = 3600; 1121our $MAX_RESET = 3600;
1265our $DEFAULT_RESET = 3000; 1122our $DEFAULT_RESET = 3000;
1266 1123
1267sub generate_random_map { 1124sub generate_random_map {
1268 my ($path, $rmp) = @_; 1125 my ($self, $rmp) = @_;
1269 1126
1270 # mit "rum" bekleckern, nicht 1127 # mit "rum" bekleckern, nicht
1271 cf::map::_create_random_map ( 1128 $self->_create_random_map (
1272 $path,
1273 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1274 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1275 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1276 $rmp->{exit_on_final_map}, 1132 $rmp->{exit_on_final_map},
1277 $rmp->{xsize}, $rmp->{ysize}, 1133 $rmp->{xsize}, $rmp->{ysize},
… …
1282 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1283 (cf::region::find $rmp->{region}), $rmp->{custom} 1139 (cf::region::find $rmp->{region}), $rmp->{custom}
1284 ) 1140 )
1285} 1141}
1286 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
1287# and all this just because we cannot iterate over 1253# and all this just because we cannot iterate over
1288# all maps in C++... 1254# all maps in C++...
1289sub change_all_map_light { 1255sub change_all_map_light {
1290 my ($change) = @_; 1256 my ($change) = @_;
1291 1257
1292 $_->change_map_light ($change) 1258 $_->change_map_light ($change)
1293 for grep $_->outdoor, values %cf::MAP; 1259 for grep $_->outdoor, values %cf::MAP;
1294} 1260}
1295 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
1296sub load_map_header($) { 1270sub load_header_from($) {
1297 my ($path) = @_; 1271 my ($self, $path) = @_;
1298 1272
1299 utf8::encode $path; 1273 utf8::encode $path;
1300 aio_open $path, O_RDONLY, 0 1274 aio_open $path, O_RDONLY, 0
1301 or return; 1275 or return;
1302 1276
1303 my $map = cf::map::new 1277 $self->_load_header ($path)
1304 or return; 1278 or return;
1305 1279
1306 # for better error messages only, will be overwritten later 1280 $self->{load_path} = $path;
1307 $map->path ($path);
1308 1281
1309 $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
1310 or return; 1308 or return;
1311 1309
1312 $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 }
1313 1315
1314 $map 1316 1
1315} 1317}
1316 1318
1317sub find; 1319sub find;
1318sub find { 1320sub find {
1319 my ($path, $origin) = @_; 1321 my ($path, $origin) = @_;
1320 1322
1321 #warn "find<$path,$origin>\n";#d#
1322
1323 $path = new cf::path $path, $origin && $origin->path; 1323 $path = normalise $path, $origin && $origin->path;
1324 my $key = $path->as_string;
1325 1324
1326 cf::lock_wait "map_find:$key"; 1325 cf::lock_wait "map_find:$path";
1327 1326
1328 $cf::MAP{$key} || do { 1327 $cf::MAP{$path} || do {
1329 my $guard = cf::lock_acquire "map_find:$key"; 1328 my $guard = cf::lock_acquire "map_find:$path";
1330 1329 my $map = new_from_path cf::map $path
1331 # do it the slow way
1332 my $map = $path->load_temp;
1333
1334 Coro::cede;
1335
1336 if ($map) {
1337 $map->last_access ((delete $map->{last_access})
1338 || $cf::RUNTIME); #d#
1339 # safety
1340 $map->{instantiate_time} = $cf::RUNTIME
1341 if $map->{instantiate_time} > $cf::RUNTIME;
1342 } else {
1343 $map = $path->load_orig
1344 or return; 1330 or return;
1345 1331
1346 $map->{load_original} = 1;
1347 $map->{instantiate_time} = $cf::RUNTIME;
1348 $map->last_access ($cf::RUNTIME);
1349 $map->instantiate;
1350
1351 # per-player maps become, after loading, normal maps
1352 $map->per_player (0) if $path->{user_rel};
1353 }
1354
1355 $map->path ($key);
1356 $map->{path} = $path;
1357 $map->{last_save} = $cf::RUNTIME; 1332 $map->{last_save} = $cf::RUNTIME;
1358 1333
1359 Coro::cede; 1334 $map->load_header
1335 or return;
1360 1336
1361 if ($map->should_reset) { 1337 if ($map->should_reset) {
1362 $map->reset; 1338 $map->reset;
1363 undef $guard; 1339 undef $guard;
1364 $map = find $path 1340 $map = find $path
1365 or return; 1341 or return;
1366 } 1342 }
1367 1343
1368 $cf::MAP{$key} = $map 1344 $cf::MAP{$path} = $map
1369 } 1345 }
1370} 1346}
1371 1347
1372sub load { 1348sub load {
1373 my ($self) = @_; 1349 my ($self) = @_;
1374 1350
1375 my $path = $self->{path}; 1351 my $path = $self->{path};
1376 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1352 my $guard = cf::lock_acquire "map_load:$path";
1377 1353
1378 return if $self->in_memory != cf::MAP_SWAPPED; 1354 return if $self->in_memory != cf::MAP_SWAPPED;
1379 1355
1380 $self->in_memory (cf::MAP_LOADING); 1356 $self->in_memory (cf::MAP_LOADING);
1381 1357
1382 $self->alloc; 1358 $self->alloc;
1383 $self->load_objects ($self->{load_path}, 1) 1359 $self->_load_objects ($self->{load_path}, 1)
1384 or return; 1360 or return;
1385 1361
1386 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1387 if delete $self->{load_original}; 1363 if delete $self->{load_original};
1388 1364
1389 if (my $uniq = $path->uniq_path) { 1365 if (my $uniq = $self->uniq_path) {
1390 utf8::encode $uniq; 1366 utf8::encode $uniq;
1391 if (aio_open $uniq, O_RDONLY, 0) { 1367 if (aio_open $uniq, O_RDONLY, 0) {
1392 $self->clear_unique_items; 1368 $self->clear_unique_items;
1393 $self->load_objects ($uniq, 0); 1369 $self->_load_objects ($uniq, 0);
1394 } 1370 }
1395 } 1371 }
1396 1372
1397 Coro::cede; 1373 Coro::cede;
1398 1374
1399 # now do the right thing for maps 1375 # now do the right thing for maps
1400 $self->link_multipart_objects; 1376 $self->link_multipart_objects;
1401 1377
1402 if ($self->{path}->is_style_map) { 1378 unless ($self->{deny_activate}) {
1403 $self->{deny_save} = 1; 1379 $self->decay_objects;
1404 $self->{deny_reset} = 1;
1405 } else {
1406 $self->fix_auto_apply; 1380 $self->fix_auto_apply;
1407 $self->decay_objects;
1408 $self->update_buttons; 1381 $self->update_buttons;
1382 Coro::cede;
1409 $self->set_darkness_map; 1383 $self->set_darkness_map;
1410 $self->difficulty ($self->estimate_difficulty) 1384 $self->difficulty ($self->estimate_difficulty)
1411 unless $self->difficulty; 1385 unless $self->difficulty;
1386 Coro::cede;
1412 $self->activate; 1387 $self->activate;
1413 } 1388 }
1414 1389
1415 Coro::cede;
1416
1417 $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
1418} 1400}
1419 1401
1420# 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
1421sub load_diag { 1403sub load_diag {
1422 my ($map) = @_; 1404 my ($map) = @_;
… …
1454} 1436}
1455 1437
1456our %MAP_PREFETCH; 1438our %MAP_PREFETCH;
1457our $MAP_PREFETCHER = Coro::async { 1439our $MAP_PREFETCHER = Coro::async {
1458 while () { 1440 while () {
1459 while (%MAP_PREFETCH) { 1441 for my $path (keys %MAP_PREFETCH) {
1460 my $key = each %MAP_PREFETCH
1461 or next;
1462 my $path = delete $MAP_PREFETCH{$key};
1463
1464 my $map = find $path 1442 my $map = find $path
1465 or next; 1443 or next;
1466 $map->load; 1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1467 } 1447 }
1468 Coro::schedule; 1448 Coro::schedule;
1469 } 1449 }
1470}; 1450};
1471 1451
1472sub find_async { 1452sub find_async {
1473 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1474 1454
1475 $path = new cf::path $path, $origin && $origin->path; 1455 $path = normalise $path, $origin && $origin->{path};
1476 my $key = $path->as_string;
1477 1456
1478 if (my $map = $cf::MAP{$key}) { 1457 if (my $map = $cf::MAP{$path}) {
1479 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1480 } 1459 }
1481 1460
1482 $MAP_PREFETCH{$key} = $path; 1461 $MAP_PREFETCH{$path} = 0;
1483 $MAP_PREFETCHER->ready; 1462 $MAP_PREFETCHER->ready;
1484 1463
1485 () 1464 ()
1486} 1465}
1487 1466
… …
1492 1471
1493 $self->{last_save} = $cf::RUNTIME; 1472 $self->{last_save} = $cf::RUNTIME;
1494 1473
1495 return unless $self->dirty; 1474 return unless $self->dirty;
1496 1475
1497 my $save = $self->{path}->save_path; utf8::encode $save; 1476 my $save = $self->save_path; utf8::encode $save;
1498 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1477 my $uniq = $self->uniq_path; utf8::encode $uniq;
1499 1478
1500 $self->{load_path} = $save; 1479 $self->{load_path} = $save;
1501 1480
1502 return if $self->{deny_save}; 1481 return if $self->{deny_save};
1503 1482
… …
1506 cf::async { 1485 cf::async {
1507 $_->contr->save for $self->players; 1486 $_->contr->save for $self->players;
1508 }; 1487 };
1509 1488
1510 if ($uniq) { 1489 if ($uniq) {
1511 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1490 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1512 $self->save_objects ($uniq, cf::IO_UNIQUES); 1491 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1513 } else { 1492 } else {
1514 $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);
1515 } 1494 }
1516} 1495}
1517 1496
1518sub swap_out { 1497sub swap_out {
1519 my ($self) = @_; 1498 my ($self) = @_;
… …
1533 1512
1534sub reset_at { 1513sub reset_at {
1535 my ($self) = @_; 1514 my ($self) = @_;
1536 1515
1537 # TODO: safety, remove and allow resettable per-player maps 1516 # TODO: safety, remove and allow resettable per-player maps
1538 return 1e99 if $self->{path}{user_rel}; 1517 return 1e99 if $self->isa ("ext::map_per_player");
1539 return 1e99 if $self->{deny_reset}; 1518 return 1e99 if $self->{deny_reset};
1540 1519
1541 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1542 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;
1543 1522
… …
1548 my ($self) = @_; 1527 my ($self) = @_;
1549 1528
1550 $self->reset_at <= $cf::RUNTIME 1529 $self->reset_at <= $cf::RUNTIME
1551} 1530}
1552 1531
1553sub unlink_save {
1554 my ($self) = @_;
1555
1556 utf8::encode (my $save = $self->{path}->save_path);
1557 aioreq_pri 3; IO::AIO::aio_unlink $save;
1558 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1559}
1560
1561sub rename { 1532sub rename {
1562 my ($self, $new_path) = @_; 1533 my ($self, $new_path) = @_;
1563 1534
1535 normalise $new_path;
1536
1564 $self->unlink_save; 1537 $self->unlink_save;
1565 1538
1566 delete $cf::MAP{$self->path}; 1539 delete $cf::MAP{$self->path};
1567 $self->{path} = new cf::path $new_path; 1540 $self->{path} = $new_path; $self->path ($self->{path});
1568 $self->path ($self->{path}->as_string);
1569 $cf::MAP{$self->path} = $self; 1541 $cf::MAP{$self->path} = $self;
1570 1542
1571 $self->save; 1543 $self->save;
1572} 1544}
1573 1545
… …
1575 my ($self) = @_; 1547 my ($self) = @_;
1576 1548
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 1549 my $lock = cf::lock_acquire "map_data:" . $self->path;
1578 1550
1579 return if $self->players; 1551 return if $self->players;
1580 return if $self->{path}{user_rel};#d# 1552 return if $self->isa ("ext::map_per_player");#d#
1581 1553
1582 warn "resetting map ", $self->path;#d# 1554 warn "resetting map ", $self->path;#d#
1583 1555
1584 delete $cf::MAP{$self->path}; 1556 delete $cf::MAP{$self->path};
1585 1557
… …
1598 $self->reset_timeout (1); 1570 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 1571 $self->rename ("{nuke}/" . ($nuke_counter++));
1600 $self->reset; # polite request, might not happen 1572 $self->reset; # polite request, might not happen
1601} 1573}
1602 1574
1603sub customise_for {
1604 my ($map, $ob) = @_;
1605
1606 if ($map->per_player) {
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1608 }
1609
1610 $map
1611}
1612
1613=item cf::map::unique_maps 1575=item cf::map::unique_maps
1614 1576
1615Returns an arrayref of cf::path's of all shared maps that have 1577Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 1578instantiated unique items. May block.
1617 1579
1618=cut 1580=cut
1619 1581
1620sub unique_maps() { 1582sub unique_maps() {
… …
1626 for (@$files) { 1588 for (@$files) {
1627 utf8::decode $_; 1589 utf8::decode $_;
1628 next if /\.pst$/; 1590 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o; 1591 next unless /^$PATH_SEP/o;
1630 1592
1631 push @paths, new cf::path $_; 1593 push @paths, $_;
1632 } 1594 }
1633 1595
1634 \@paths 1596 \@paths
1635} 1597}
1636 1598
… …
1711 1673
1712=item $player_object->enter_link 1674=item $player_object->enter_link
1713 1675
1714Freezes 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}>).
1715 1677
1716The 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
1717I<MUST> call C<leave_link> as soon as possible, though. 1679I<MUST> call C<leave_link> as soon as possible, though.
1718 1680
1681Will never block.
1682
1719=item $player_object->leave_link ($map, $x, $y) 1683=item $player_object->leave_link ($map, $x, $y)
1720 1684
1721Moves 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
1722map 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
1723location 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
1724to the emergency map position. 1688fails, to the emergency map position.
1725 1689
1726Might block. 1690Might block.
1727 1691
1728=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}
1729 1703
1730sub cf::object::player::enter_link { 1704sub cf::object::player::enter_link {
1731 my ($self) = @_; 1705 my ($self) = @_;
1732 1706
1733 $self->deactivate_recursive; 1707 $self->deactivate_recursive;
1734 1708
1735 return if $self->map == $LINK_MAP; 1709 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 1710
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 1712 if $self->map;
1739 1713
1740 $self->enter_map ($LINK_MAP, 20, 20); 1714 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1741} 1715}
1742 1716
1743sub cf::object::player::leave_link { 1717sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 1718 my ($self, $map, $x, $y) = @_;
1745 1719
… …
1809=cut 1783=cut
1810 1784
1811sub cf::object::player::goto { 1785sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1813 1787
1814 $path = new cf::path $path;
1815
1816 $self->enter_link; 1788 $self->enter_link;
1817 1789
1818 (async { 1790 (async {
1819 my $map = cf::map::find $path->as_string; 1791 my $map = cf::map::find $path;
1820 $map = $map->customise_for ($self) if $map; 1792 $map = $map->customise_for ($self) if $map;
1821 1793
1822# warn "entering ", $map->path, " at ($x, $y)\n" 1794# warn "entering ", $map->path, " at ($x, $y)\n"
1823# if $map; 1795# if $map;
1824 1796
… …
1889 $self->deactivate_recursive; # just to be sure 1861 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 1862 unless (eval {
1891 prepare_random_map $exit 1863 prepare_random_map $exit
1892 if $exit->slaying eq "/!"; 1864 if $exit->slaying eq "/!";
1893 1865
1894 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;
1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1896 1868
1897 1; 1869 1;
1898 }) { 1870 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 1871 $self->message ("Something went wrong deep within the crossfire server. "
… …
2406 exit 1; 2378 exit 1;
2407 } 2379 }
2408 2380
2409 warn "reloaded"; 2381 warn "reloaded";
2410}; 2382};
2411
2412#############################################################################
2413
2414unless ($LINK_MAP) {
2415 $LINK_MAP = cf::map::new;
2416
2417 $LINK_MAP->width (41);
2418 $LINK_MAP->height (41);
2419 $LINK_MAP->alloc;
2420 $LINK_MAP->path ("{link}");
2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2423
2424 # dirty hack because... archetypes are not yet loaded
2425 Event->timer (
2426 after => 10,
2427 cb => sub {
2428 $_[0]->w->cancel;
2429
2430 # provide some exits "home"
2431 my $exit = cf::object::new "exit";
2432
2433 $exit->slaying ($EMERGENCY_POSITION->[0]);
2434 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2435 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2436
2437 $LINK_MAP->insert ($exit->clone, 19, 19);
2438 $LINK_MAP->insert ($exit->clone, 19, 20);
2439 $LINK_MAP->insert ($exit->clone, 19, 21);
2440 $LINK_MAP->insert ($exit->clone, 20, 19);
2441 $LINK_MAP->insert ($exit->clone, 20, 21);
2442 $LINK_MAP->insert ($exit->clone, 21, 19);
2443 $LINK_MAP->insert ($exit->clone, 21, 20);
2444 $LINK_MAP->insert ($exit->clone, 21, 21);
2445
2446 $exit->destroy;
2447 });
2448
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453}
2454 2383
2455register_command "reload" => sub { 2384register_command "reload" => sub {
2456 my ($who, $arg) = @_; 2385 my ($who, $arg) = @_;
2457 2386
2458 if ($who->flag (FLAG_WIZ)) { 2387 if ($who->flag (FLAG_WIZ)) {

Diff Legend

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