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

Diff Legend

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