ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC

… …
33 33
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 35
36our %COMMAND = (); 36our %COMMAND = ();
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
39 43
40our @EVENT; 44our @EVENT;
41our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
42 46
43our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
… …
50our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
51our $RUNTIME; 55our $RUNTIME;
52 56
53our %PLAYER; # all users 57our %PLAYER; # all users
54our %MAP; # all maps 58our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map, which is always available
56our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions
58 61
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $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
61 67
62binmode STDOUT; 68binmode STDOUT;
63binmode STDERR; 69binmode STDERR;
64 70
65# read virtual server time, if available 71# read virtual server time, if available
… …
73mkdir cf::localdir . "/" . cf::playerdir; 79mkdir cf::localdir . "/" . cf::playerdir;
74mkdir cf::localdir . "/" . cf::tmpdir; 80mkdir cf::localdir . "/" . cf::tmpdir;
75mkdir cf::localdir . "/" . cf::uniquedir; 81mkdir cf::localdir . "/" . cf::uniquedir;
76mkdir $RANDOM_MAPS; 82mkdir $RANDOM_MAPS;
77 83
78# a special map that is always available
79our $LINK_MAP;
80our $EMERGENCY_POSITION; 84our $EMERGENCY_POSITION;
81 85
82############################################################################# 86#############################################################################
83 87
84=head2 GLOBAL VARIABLES 88=head2 GLOBAL VARIABLES
… …
156} 160}
157 161
158$Event::DIED = sub { 162$Event::DIED = sub {
159 warn "error in event callback: @_"; 163 warn "error in event callback: @_";
160}; 164};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 165
166=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
167 167
168=over 4 168=over 4
169 169
… …
319 } 319 }
320} 320}
321 321
322=item $coro = cf::async_ext { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
323 323
324Like async, but this coro is automcatially being canceled when the 324Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 325extension calling this is being unloaded.
326 326
327=cut 327=cut
328 328
329sub async_ext(&) { 329sub async_ext(&) {
… …
338 338
339 $coro 339 $coro
340} 340}
341 341
342sub write_runtime { 342sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
343 my $runtime = cf::localdir . "/runtime"; 345 my $runtime = cf::localdir . "/runtime";
344 346
345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
346 or return; 348 or return;
347 349
… …
362} 364}
363 365
364=back 366=back
365 367
366=cut 368=cut
367
368#############################################################################
369
370package cf::path;
371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377
378sub new {
379 my ($class, $path, $base) = @_;
380
381 $path = $path->as_string if ref $path;
382
383 my $self = bless { }, $class;
384
385 # {... are special paths that are not touched
386 # ?xxx/... are special absolute paths
387 # ?random/... random maps
388 # /! non-realised random map exit
389 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE)
391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
394
395 if ($path =~ /^{/) {
396 # fine as it is
397 } elsif ($path =~ s{^\?random/}{}) {
398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399 $self->{random} = cf::from_json $data;
400 } else {
401 if ($path =~ s{^~([^/]+)?}{}) {
402 $self->{user_rel} = 1;
403
404 if (defined $1) {
405 $self->{user} = $1;
406 } elsif ($base =~ m{^~([^/]+)/}) {
407 $self->{user} = $1;
408 } else {
409 warn "cannot resolve user-relative path without user <$path,$base>\n";
410 }
411 } elsif ($path =~ /^\//) {
412 # already absolute
413 } else {
414 $base =~ s{[^/]+/?$}{};
415 return $class->new ("$base/$path");
416 }
417
418 for ($path) {
419 redo if s{/\.?/}{/};
420 redo if s{/[^/]+/\.\./}{/};
421 }
422 }
423
424 $self->{path} = $path;
425
426 $self
427}
428
429# the name / primary key / in-game path
430sub as_string {
431 my ($self) = @_;
432
433 $self->{user_rel} ? "~$self->{user}$self->{path}"
434 : $self->{random} ? "?random/$self->{path}"
435 : $self->{path}
436}
437
438# the displayed name, this is a one way mapping
439sub visible_name {
440 my ($self) = @_;
441
442# if (my $rmp = $self->{random}) {
443# # todo: be more intelligent about this
444# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445# } else {
446 $self->as_string
447# }
448}
449
450# escape the /'s in the path
451sub _escaped_path {
452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
453 $path
454}
455
456# the original (read-only) location
457sub load_path {
458 my ($self) = @_;
459
460 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
461}
462
463# the temporary/swap location
464sub save_path {
465 my ($self) = @_;
466
467 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470}
471
472# the unique path, might be eq to save_path
473sub uniq_path {
474 my ($self) = @_;
475
476 $self->{user_rel} || $self->{random}
477 ? undef
478 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479}
480
481# return random map parameters, or undef
482sub random_map_params {
483 my ($self) = @_;
484
485 $self->{random}
486}
487
488# this is somewhat ugly, but style maps do need special treatment
489sub is_style_map {
490 $_[0]{path} =~ m{^/styles/}
491}
492
493package cf;
494 369
495############################################################################# 370#############################################################################
496 371
497=head2 ATTACHABLE OBJECTS 372=head2 ATTACHABLE OBJECTS
498 373
… …
945=cut 820=cut
946 821
947sub register_extcmd { 822sub register_extcmd {
948 my ($name, $cb) = @_; 823 my ($name, $cb) = @_;
949 824
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 825 $EXTCMD{$name} = $cb;
954} 826}
955 827
956cf::player->attach ( 828cf::player->attach (
957 on_command => sub { 829 on_command => sub {
958 my ($pl, $name, $params) = @_; 830 my ($pl, $name, $params) = @_;
… …
971 843
972 my $msg = eval { from_json $buf }; 844 my $msg = eval { from_json $buf };
973 845
974 if (ref $msg) { 846 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 847 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 848 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 849 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 850 }
979 } 851 }
980 } else { 852 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 855
984 cf::override; 856 cf::override;
985 }, 857 },
986); 858);
987 859
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 860sub load_extension {
995 my ($path) = @_; 861 my ($path) = @_;
996 862
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 864 my $base = $1;
999 my $pkg = $1; 865 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 866 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 867 $pkg = "ext::$pkg";
1002 868
1003 warn "loading '$path' into '$pkg'\n"; 869 warn "... loading '$path' into '$pkg'\n";
1004 870
1005 open my $fh, "<:utf8", $path 871 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 872 or die "$path: $!";
1007 873
1008 my $source = 874 my $source =
1009 "package $pkg; use strict; use utf8;\n" 875 "package $pkg; use strict; use utf8;\n"
1010 . "#line 1 \"$path\"\n{\n" 876 . "#line 1 \"$path\"\n{\n"
1011 . (do { local $/; <$fh> }) 877 . (do { local $/; <$fh> })
1012 . "\n};\n1"; 878 . "\n};\n1";
1013 879
1014 eval $source 880 unless (eval $source) {
1015 or die $@ ? "$path: $@\n" 881 my $msg = $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 882 : "extension disabled.\n";
1017 883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
1018 push @exts, $pkg; 884 warn $@;
1019 $ext_pkg{$base} = $pkg; 885 warn "mandatory extension failed to load, exiting.\n";
1020 886 exit 1;
1021# no strict 'refs'; 887 }
1022# @{"$pkg\::ISA"} = ext::; 888 die $@;
1023
1024 register $base, $pkg;
1025}
1026
1027sub unload_extension {
1028 my ($pkg) = @_;
1029
1030 warn "removing extension $pkg\n";
1031
1032 # remove hooks
1033 #TODO
1034# for my $idx (0 .. $#PLUGIN_EVENT) {
1035# delete $hook[$idx]{$pkg};
1036# } 889 }
1037 890
1038 # remove commands 891 push @EXTS, $pkg;
1039 for my $name (keys %COMMAND) {
1040 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042 if (@cb) {
1043 $COMMAND{$name} = \@cb;
1044 } else {
1045 delete $COMMAND{$name};
1046 }
1047 }
1048
1049 # remove extcmds
1050 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051 delete $EXTCMD{$name};
1052 }
1053
1054 if (my $cb = $pkg->can ("unload")) {
1055 eval {
1056 $cb->($pkg);
1057 1
1058 } or warn "$pkg unloaded, but with errors: $@";
1059 }
1060
1061 Symbol::delete_package $pkg;
1062} 892}
1063 893
1064sub load_extensions { 894sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 895 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 896 next unless -r $ext;
… …
1070 } or warn "$ext not loaded: $@"; 900 } or warn "$ext not loaded: $@";
1071 } 901 }
1072} 902}
1073 903
1074############################################################################# 904#############################################################################
1075# load/save/clean perl data associated with a map
1076
1077*cf::mapsupport::on_clean = sub {
1078 my ($map) = @_;
1079
1080 my $path = $map->tmpname;
1081 defined $path or return;
1082
1083 unlink "$path.pst";
1084};
1085
1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1087
1088#############################################################################
1089 905
1090=head2 CORE EXTENSIONS 906=head2 CORE EXTENSIONS
1091 907
1092Functions and methods that extend core crossfire objects. 908Functions and methods that extend core crossfire objects.
1093 909
… …
1229 \@logins 1045 \@logins
1230} 1046}
1231 1047
1232=item $player->maps 1048=item $player->maps
1233 1049
1234Returns 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
1235player. May block. 1051player. May block.
1236 1052
1237=cut 1053=cut
1238 1054
1239sub maps($) { 1055sub maps($) {
… …
1247 for (@$files) { 1063 for (@$files) {
1248 utf8::decode $_; 1064 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/; 1065 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o; 1066 next unless /^$PATH_SEP/o;
1251 1067
1068 s/\.map$//;
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1253 } 1070 }
1254 1071
1255 \@paths 1072 \@paths
1256} 1073}
1257 1074
… …
1283package cf::map; 1100package cf::map;
1284 1101
1285use Fcntl; 1102use Fcntl;
1286use Coro::AIO; 1103use Coro::AIO;
1287 1104
1105use overload
1106 '""' => \&as_string;
1107
1288our $MAX_RESET = 3600; 1108our $MAX_RESET = 3600;
1289our $DEFAULT_RESET = 3000; 1109our $DEFAULT_RESET = 3000;
1290 1110
1291sub generate_random_map { 1111sub generate_random_map {
1292 my ($path, $rmp) = @_; 1112 my ($self, $rmp) = @_;
1293 1113
1294 # mit "rum" bekleckern, nicht 1114 # mit "rum" bekleckern, nicht
1295 cf::map::_create_random_map 1115 $self->_create_random_map (
1296 $path,
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map}, 1119 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize}, 1120 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1121 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1122 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1123 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1124 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (cf::region::find $rmp->{region}) 1126 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 )
1128}
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
1308} 1233}
1309 1234
1310# and all this just because we cannot iterate over 1235# and all this just because we cannot iterate over
1311# all maps in C++... 1236# all maps in C++...
1312sub change_all_map_light { 1237sub change_all_map_light {
… …
1314 1239
1315 $_->change_map_light ($change) 1240 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1241 for grep $_->outdoor, values %cf::MAP;
1317} 1242}
1318 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
1319sub try_load_header($) { 1252sub load_header_from($) {
1320 my ($path) = @_; 1253 my ($self, $path) = @_;
1321 1254
1322 utf8::encode $path; 1255 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1256 aio_open $path, O_RDONLY, 0
1324 or return; 1257 or return;
1325 1258
1326 my $map = cf::map::new 1259 $self->_load_header ($path)
1327 or return; 1260 or return;
1328 1261
1329 # for better error messages only, will be overwritten 1262 $self->{load_path} = $path;
1330 $map->path ($path);
1331 1263
1332 $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
1333 or return; 1290 or return;
1334 1291
1335 $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 }
1336 1297
1337 $map 1298 1
1338} 1299}
1339 1300
1340sub find; 1301sub find;
1341sub find { 1302sub find {
1342 my ($path, $origin) = @_; 1303 my ($path, $origin) = @_;
1343 1304
1344 #warn "find<$path,$origin>\n";#d#
1345
1346 $path = new cf::path $path, $origin && $origin->path; 1305 $path = normalise $path, $origin && $origin->path;
1347 my $key = $path->as_string;
1348 1306
1349 cf::lock_wait "map_find:$key"; 1307 cf::lock_wait "map_find:$path";
1350 1308
1351 $cf::MAP{$key} || do { 1309 $cf::MAP{$path} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1310 my $guard = cf::lock_acquire "map_find:$path";
1353 1311 my $map = new_from_path cf::map $path
1354 # do it the slow way
1355 my $map = try_load_header $path->save_path;
1356
1357 Coro::cede;
1358
1359 if ($map) {
1360 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d#
1362 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else {
1366 if (my $rmp = $path->random_map_params) {
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
1370 }
1371
1372 $map or return; 1312 or return;
1373 1313
1374 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate;
1378
1379 # per-player maps become, after loading, normal maps
1380 $map->per_player (0) if $path->{user_rel};
1381 }
1382
1383 $map->path ($key);
1384 $map->{path} = $path;
1385 $map->{last_save} = $cf::RUNTIME; 1314 $map->{last_save} = $cf::RUNTIME;
1386 1315
1387 Coro::cede; 1316 $map->load_header
1317 or return;
1388 1318
1389 if ($map->should_reset) { 1319 if ($map->should_reset) {
1390 $map->reset; 1320 $map->reset;
1391 undef $guard; 1321 undef $guard;
1392 $map = find $path 1322 $map = find $path
1393 or return; 1323 or return;
1394 } 1324 }
1395 1325
1396 $cf::MAP{$key} = $map 1326 $cf::MAP{$path} = $map
1397 } 1327 }
1398} 1328}
1399 1329
1400sub load { 1330sub load {
1401 my ($self) = @_; 1331 my ($self) = @_;
1402 1332
1403 my $path = $self->{path}; 1333 my $path = $self->{path};
1404 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1334 my $guard = cf::lock_acquire "map_load:$path";
1405 1335
1406 return if $self->in_memory != cf::MAP_SWAPPED; 1336 return if $self->in_memory != cf::MAP_SWAPPED;
1407 1337
1408 $self->in_memory (cf::MAP_LOADING); 1338 $self->in_memory (cf::MAP_LOADING);
1409 1339
1410 $self->alloc; 1340 $self->alloc;
1411 $self->load_objects ($self->{load_path}, 1) 1341 $self->_load_objects ($self->{load_path}, 1)
1412 or return; 1342 or return;
1413 1343
1414 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1415 if delete $self->{load_original}; 1345 if delete $self->{load_original};
1416 1346
1417 if (my $uniq = $path->uniq_path) { 1347 if (my $uniq = $self->uniq_path) {
1418 utf8::encode $uniq; 1348 utf8::encode $uniq;
1419 if (aio_open $uniq, O_RDONLY, 0) { 1349 if (aio_open $uniq, O_RDONLY, 0) {
1420 $self->clear_unique_items; 1350 $self->clear_unique_items;
1421 $self->load_objects ($uniq, 0); 1351 $self->_load_objects ($uniq, 0);
1422 } 1352 }
1423 } 1353 }
1424 1354
1425 Coro::cede; 1355 Coro::cede;
1426 1356
1427 # now do the right thing for maps 1357 # now do the right thing for maps
1428 $self->link_multipart_objects; 1358 $self->link_multipart_objects;
1429 1359
1430 if ($self->{path}->is_style_map) { 1360 unless ($self->{deny_activate}) {
1431 $self->{deny_save} = 1; 1361 $self->decay_objects;
1432 $self->{deny_reset} = 1;
1433 } else {
1434 $self->fix_auto_apply; 1362 $self->fix_auto_apply;
1435 $self->decay_objects;
1436 $self->update_buttons; 1363 $self->update_buttons;
1364 Coro::cede;
1437 $self->set_darkness_map; 1365 $self->set_darkness_map;
1438 $self->difficulty ($self->estimate_difficulty) 1366 $self->difficulty ($self->estimate_difficulty)
1439 unless $self->difficulty; 1367 unless $self->difficulty;
1368 Coro::cede;
1440 $self->activate; 1369 $self->activate;
1441 } 1370 }
1442 1371
1443 Coro::cede;
1444
1445 $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
1446} 1382}
1447 1383
1448# 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
1449sub load_diag { 1385sub load_diag {
1450 my ($map) = @_; 1386 my ($map) = @_;
… …
1482} 1418}
1483 1419
1484our %MAP_PREFETCH; 1420our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async { 1421our $MAP_PREFETCHER = Coro::async {
1486 while () { 1422 while () {
1487 while (%MAP_PREFETCH) { 1423 for my $path (keys %MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path 1424 my $map = find $path
1493 or next; 1425 or next;
1494 $map->load; 1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1495 } 1429 }
1496 Coro::schedule; 1430 Coro::schedule;
1497 } 1431 }
1498}; 1432};
1499 1433
1500sub find_async { 1434sub find_async {
1501 my ($path, $origin) = @_; 1435 my ($path, $origin) = @_;
1502 1436
1503 $path = new cf::path $path, $origin && $origin->path; 1437 $path = normalise $path, $origin && $origin->{path};
1504 my $key = $path->as_string;
1505 1438
1506 if (my $map = $cf::MAP{$key}) { 1439 if (my $map = $cf::MAP{$path}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 } 1441 }
1509 1442
1510 $MAP_PREFETCH{$key} = $path; 1443 $MAP_PREFETCH{$path} = 0;
1511 $MAP_PREFETCHER->ready; 1444 $MAP_PREFETCHER->ready;
1512 1445
1513 () 1446 ()
1514} 1447}
1515 1448
… …
1520 1453
1521 $self->{last_save} = $cf::RUNTIME; 1454 $self->{last_save} = $cf::RUNTIME;
1522 1455
1523 return unless $self->dirty; 1456 return unless $self->dirty;
1524 1457
1525 my $save = $self->{path}->save_path; utf8::encode $save; 1458 my $save = $self->save_path; utf8::encode $save;
1526 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1459 my $uniq = $self->uniq_path; utf8::encode $uniq;
1527 1460
1528 $self->{load_path} = $save; 1461 $self->{load_path} = $save;
1529 1462
1530 return if $self->{deny_save}; 1463 return if $self->{deny_save};
1531 1464
… …
1534 cf::async { 1467 cf::async {
1535 $_->contr->save for $self->players; 1468 $_->contr->save for $self->players;
1536 }; 1469 };
1537 1470
1538 if ($uniq) { 1471 if ($uniq) {
1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1472 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1540 $self->save_objects ($uniq, cf::IO_UNIQUES); 1473 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1541 } else { 1474 } else {
1542 $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);
1543 } 1476 }
1544} 1477}
1545 1478
1546sub swap_out { 1479sub swap_out {
1547 my ($self) = @_; 1480 my ($self) = @_;
… …
1561 1494
1562sub reset_at { 1495sub reset_at {
1563 my ($self) = @_; 1496 my ($self) = @_;
1564 1497
1565 # TODO: safety, remove and allow resettable per-player maps 1498 # TODO: safety, remove and allow resettable per-player maps
1566 return 1e99 if $self->{path}{user_rel}; 1499 return 1e99 if $self->isa ("ext::map_per_player");
1567 return 1e99 if $self->{deny_reset}; 1500 return 1e99 if $self->{deny_reset};
1568 1501
1569 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1570 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;
1571 1504
… …
1576 my ($self) = @_; 1509 my ($self) = @_;
1577 1510
1578 $self->reset_at <= $cf::RUNTIME 1511 $self->reset_at <= $cf::RUNTIME
1579} 1512}
1580 1513
1581sub unlink_save {
1582 my ($self) = @_;
1583
1584 utf8::encode (my $save = $self->{path}->save_path);
1585 aioreq_pri 3; IO::AIO::aio_unlink $save;
1586 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1587}
1588
1589sub rename { 1514sub rename {
1590 my ($self, $new_path) = @_; 1515 my ($self, $new_path) = @_;
1591 1516
1517 normalise $new_path;
1518
1592 $self->unlink_save; 1519 $self->unlink_save;
1593 1520
1594 delete $cf::MAP{$self->path}; 1521 delete $cf::MAP{$self->path};
1595 $self->{path} = new cf::path $new_path; 1522 $self->{path} = $new_path; $self->path ($self->{path});
1596 $self->path ($self->{path}->as_string);
1597 $cf::MAP{$self->path} = $self; 1523 $cf::MAP{$self->path} = $self;
1598 1524
1599 $self->save; 1525 $self->save;
1600} 1526}
1601 1527
1602sub reset { 1528sub reset {
1603 my ($self) = @_; 1529 my ($self) = @_;
1604 1530
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 1531 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 1532
1607 return if $self->players; 1533 return if $self->players;
1608 return if $self->{path}{user_rel};#d# 1534 return if $self->isa ("ext::map_per_player");#d#
1609 1535
1610 warn "resetting map ", $self->path;#d# 1536 warn "resetting map ", $self->path;#d#
1611 1537
1612 delete $cf::MAP{$self->path}; 1538 delete $cf::MAP{$self->path};
1539
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear;
1613 1542
1614 $_->clear_links_to ($self) for values %cf::MAP; 1543 $_->clear_links_to ($self) for values %cf::MAP;
1615 1544
1616 $self->unlink_save; 1545 $self->unlink_save;
1617 $self->destroy; 1546 $self->destroy;
… …
1626 $self->reset_timeout (1); 1555 $self->reset_timeout (1);
1627 $self->rename ("{nuke}/" . ($nuke_counter++)); 1556 $self->rename ("{nuke}/" . ($nuke_counter++));
1628 $self->reset; # polite request, might not happen 1557 $self->reset; # polite request, might not happen
1629} 1558}
1630 1559
1631sub customise_for {
1632 my ($map, $ob) = @_;
1633
1634 if ($map->per_player) {
1635 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1636 }
1637
1638 $map
1639}
1640
1641=item cf::map::unique_maps 1560=item cf::map::unique_maps
1642 1561
1643Returns an arrayref of cf::path's of all shared maps that have 1562Returns an arrayref of paths of all shared maps that have
1644instantiated unique items. May block. 1563instantiated unique items. May block.
1645 1564
1646=cut 1565=cut
1647 1566
1648sub unique_maps() { 1567sub unique_maps() {
… …
1654 for (@$files) { 1573 for (@$files) {
1655 utf8::decode $_; 1574 utf8::decode $_;
1656 next if /\.pst$/; 1575 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o; 1576 next unless /^$PATH_SEP/o;
1658 1577
1578 s/\.map$//;
1659 push @paths, new cf::path $_; 1579 push @paths, $_;
1660 } 1580 }
1661 1581
1662 \@paths 1582 \@paths
1663} 1583}
1664 1584
… …
1739 1659
1740=item $player_object->enter_link 1660=item $player_object->enter_link
1741 1661
1742Freezes 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}>).
1743 1663
1744The 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
1745I<MUST> call C<leave_link> as soon as possible, though. 1665I<MUST> call C<leave_link> as soon as possible, though.
1746 1666
1667Will never block.
1668
1747=item $player_object->leave_link ($map, $x, $y) 1669=item $player_object->leave_link ($map, $x, $y)
1748 1670
1749Moves 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
1750map 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
1751location 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
1752to the emergency map position. 1674fails, to the emergency map position.
1753 1675
1754Might block. 1676Might block.
1755 1677
1756=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}
1757 1689
1758sub cf::object::player::enter_link { 1690sub cf::object::player::enter_link {
1759 my ($self) = @_; 1691 my ($self) = @_;
1760 1692
1761 $self->deactivate_recursive; 1693 $self->deactivate_recursive;
1762 1694
1763 return if $self->map == $LINK_MAP; 1695 return if UNIVERSAL::isa $self->map, "ext::map_link";
1764 1696
1765 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1766 if $self->map; 1698 if $self->map;
1767 1699
1768 $self->enter_map ($LINK_MAP, 20, 20); 1700 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1769} 1701}
1770 1702
1771sub cf::object::player::leave_link { 1703sub cf::object::player::leave_link {
1772 my ($self, $map, $x, $y) = @_; 1704 my ($self, $map, $x, $y) = @_;
1773 1705
… …
1837=cut 1769=cut
1838 1770
1839sub cf::object::player::goto { 1771sub cf::object::player::goto {
1840 my ($self, $path, $x, $y) = @_; 1772 my ($self, $path, $x, $y) = @_;
1841 1773
1842 $path = new cf::path $path;
1843
1844 $self->enter_link; 1774 $self->enter_link;
1845 1775
1846 (async { 1776 (async {
1847 my $map = cf::map::find $path->as_string; 1777 my $map = cf::map::find $path;
1848 $map = $map->customise_for ($self) if $map; 1778 $map = $map->customise_for ($self) if $map;
1849 1779
1850# warn "entering ", $map->path, " at ($x, $y)\n" 1780# warn "entering ", $map->path, " at ($x, $y)\n"
1851# if $map; 1781# if $map;
1852 1782
… …
1917 $self->deactivate_recursive; # just to be sure 1847 $self->deactivate_recursive; # just to be sure
1918 unless (eval { 1848 unless (eval {
1919 prepare_random_map $exit 1849 prepare_random_map $exit
1920 if $exit->slaying eq "/!"; 1850 if $exit->slaying eq "/!";
1921 1851
1922 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;
1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1924 1854
1925 1; 1855 1;
1926 }) { 1856 }) {
1927 $self->message ("Something went wrong deep within the crossfire server. " 1857 $self->message ("Something went wrong deep within the crossfire server. "
… …
2310 warn "enter emergency perl save\n"; 2240 warn "enter emergency perl save\n";
2311 2241
2312 cf::sync_job { 2242 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl 2243 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players 2244 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously. 2245 # and maps saved/destroyed asynchronously.
2316 warn "begin emergency player save\n"; 2246 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) { 2247 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next; 2248 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next; 2249 $pl->valid or next;
2320 $pl->save; 2250 $pl->save;
… …
2340 return; 2270 return;
2341 } 2271 }
2342 2272
2343 warn "reloading..."; 2273 warn "reloading...";
2344 2274
2275 warn "freezing server";
2345 my $guard = freeze_mainloop; 2276 my $guard = freeze_mainloop;
2346 cf::emergency_save; 2277 cf::emergency_save;
2347 2278
2279 warn "sync database to disk";
2280 cf::db_sync;
2281 IO::AIO::flush;
2282
2348 eval { 2283 eval {
2349 # if anything goes wrong in here, we should simply crash as we already saved 2284 # if anything goes wrong in here, we should simply crash as we already saved
2350 2285
2351 # cancel all watchers 2286 warn "cancel all watchers";
2352 for (Event::all_watchers) { 2287 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2288 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2289 }
2355 2290
2356 # cancel all extension coros 2291 warn "cancel all extension coros";
2357 $_->cancel for values %EXT_CORO; 2292 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2293 %EXT_CORO = ();
2359 2294
2295 warn "remove commands";
2296 %COMMAND = ();
2297
2298 warn "remove ext commands";
2299 %EXTCMD = ();
2300
2360 # unload all extensions 2301 warn "unload/nuke all extensions";
2361 for (@exts) { 2302 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2303 warn "... unloading $pkg";
2363 unload_extension $_; 2304
2305 if (my $cb = $pkg->can ("unload")) {
2306 eval {
2307 $cb->($pkg);
2308 1
2309 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2310 }
2365 2311
2312 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg;
2314 }
2315
2366 # unload all modules loaded from $LIBDIR 2316 warn "unload all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2317 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2319
2370 warn "removing <$k>"; 2320 warn "removing <$k>";
2371 delete $INC{$k}; 2321 delete $INC{$k};
… …
2378 } 2328 }
2379 2329
2380 Symbol::delete_package $k; 2330 Symbol::delete_package $k;
2381 } 2331 }
2382 2332
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2333 warn "get rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2334 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2336
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2337 warn "unload cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2338 delete $INC{"cf.pm"};
2396 2339
2397 # don't, removes xs symbols, too, 2340 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2341 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2342 #Symbol::delete_package __PACKAGE__;
2400 2343
2401 # reload cf.pm
2402 warn "reloading cf.pm"; 2344 warn "reloading cf.pm";
2403 require cf; 2345 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2347
2406 # load config and database again 2348 warn "load config and database again";
2407 cf::cfg_load; 2349 cf::cfg_load;
2408 cf::db_load; 2350 cf::db_load;
2409 2351
2410 # load extensions
2411 warn "load extensions"; 2352 warn "load extensions";
2412 cf::load_extensions; 2353 cf::load_extensions;
2413 2354
2414 # reattach attachments to objects 2355 warn "reattach attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2356 _global_reattach;
2357 warn "reattach attachments to maps";
2417 reattach $_ for values %MAP; 2358 reattach $_ for values %MAP;
2418 }; 2359 };
2419 2360
2420 if ($@) { 2361 if ($@) {
2421 warn $@; 2362 warn $@;
2422 warn "error while reloading, exiting."; 2363 warn "error while reloading, exiting.";
2423 exit 1; 2364 exit 1;
2424 } 2365 }
2425 2366
2426 warn "reloaded successfully"; 2367 warn "reloaded";
2427}; 2368};
2428
2429#############################################################################
2430
2431unless ($LINK_MAP) {
2432 $LINK_MAP = cf::map::new;
2433
2434 $LINK_MAP->width (41);
2435 $LINK_MAP->height (41);
2436 $LINK_MAP->alloc;
2437 $LINK_MAP->path ("{link}");
2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2440
2441 # dirty hack because... archetypes are not yet loaded
2442 Event->timer (
2443 after => 10,
2444 cb => sub {
2445 $_[0]->w->cancel;
2446
2447 # provide some exits "home"
2448 my $exit = cf::object::new "exit";
2449
2450 $exit->slaying ($EMERGENCY_POSITION->[0]);
2451 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2452 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2453
2454 $LINK_MAP->insert ($exit->clone, 19, 19);
2455 $LINK_MAP->insert ($exit->clone, 19, 20);
2456 $LINK_MAP->insert ($exit->clone, 19, 21);
2457 $LINK_MAP->insert ($exit->clone, 20, 19);
2458 $LINK_MAP->insert ($exit->clone, 20, 21);
2459 $LINK_MAP->insert ($exit->clone, 21, 19);
2460 $LINK_MAP->insert ($exit->clone, 21, 20);
2461 $LINK_MAP->insert ($exit->clone, 21, 21);
2462
2463 $exit->destroy;
2464 });
2465
2466 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1;
2468
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470}
2471
2472register "<global>", __PACKAGE__;
2473 2369
2474register_command "reload" => sub { 2370register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2371 my ($who, $arg) = @_;
2476 2372
2477 if ($who->flag (FLAG_WIZ)) { 2373 if ($who->flag (FLAG_WIZ)) {
… …
2487 reentrant => 0, 2383 reentrant => 0,
2488 prio => 0, 2384 prio => 0,
2489 at => $NEXT_TICK || $TICK, 2385 at => $NEXT_TICK || $TICK,
2490 data => WF_AUTOCANCEL, 2386 data => WF_AUTOCANCEL,
2491 cb => sub { 2387 cb => sub {
2388 $NOW = Event::time;
2389
2492 cf::server_tick; # one server iteration 2390 cf::server_tick; # one server iteration
2493 $RUNTIME += $TICK; 2391 $RUNTIME += $TICK;
2494 $NEXT_TICK += $TICK; 2392 $NEXT_TICK += $TICK;
2495 2393
2496 $WAIT_FOR_TICK->broadcast; 2394 $WAIT_FOR_TICK->broadcast;

Diff Legend

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