… | |
… | |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
24 | use Coro::Util (); |
24 | use Coro::Util (); |
25 | |
25 | |
26 | use JSON::XS 1.4 (); |
26 | use JSON::XS (); |
27 | use BDB (); |
27 | use BDB (); |
28 | use Data::Dumper; |
28 | use Data::Dumper; |
29 | use Digest::MD5; |
29 | use Digest::MD5; |
30 | use Fcntl; |
30 | use Fcntl; |
31 | use YAML::Syck (); |
31 | use YAML::Syck (); |
… | |
… | |
87 | our %CFG; |
87 | our %CFG; |
88 | |
88 | |
89 | our $UPTIME; $UPTIME ||= time; |
89 | our $UPTIME; $UPTIME ||= time; |
90 | our $RUNTIME; |
90 | our $RUNTIME; |
91 | |
91 | |
92 | our %PLAYER; # all users |
92 | our (%PLAYER, %PLAYER_LOADING); # all users |
93 | our %MAP; # all maps |
93 | our (%MAP, %MAP_LOADING ); # all maps |
94 | our $LINK_MAP; # the special {link} map, which is always available |
94 | our $LINK_MAP; # the special {link} map, which is always available |
95 | |
95 | |
96 | # used to convert map paths into valid unix filenames by replacing / by ∕ |
96 | # used to convert map paths into valid unix filenames by replacing / by ∕ |
97 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
97 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
98 | |
98 | |
… | |
… | |
272 | Wait until the given lock is available and then acquires it and returns |
272 | Wait until the given lock is available and then acquires it and returns |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
274 | for example when the coroutine gets canceled), the lock is automatically |
274 | for example when the coroutine gets canceled), the lock is automatically |
275 | returned. |
275 | returned. |
276 | |
276 | |
|
|
277 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
278 | deadlocked coro. |
|
|
279 | |
277 | Lock names should begin with a unique identifier (for example, cf::map::find |
280 | Lock names should begin with a unique identifier (for example, cf::map::find |
278 | uses map_find and cf::map::load uses map_load). |
281 | uses map_find and cf::map::load uses map_load). |
279 | |
282 | |
280 | =item $locked = cf::lock_active $string |
283 | =item $locked = cf::lock_active $string |
281 | |
284 | |
282 | Return true if the lock is currently active, i.e. somebody has locked it. |
285 | Return true if the lock is currently active, i.e. somebody has locked it. |
283 | |
286 | |
284 | =cut |
287 | =cut |
285 | |
288 | |
286 | our %LOCK; |
289 | our %LOCK; |
|
|
290 | our %LOCKER;#d# |
287 | |
291 | |
288 | sub lock_wait($) { |
292 | sub lock_wait($) { |
289 | my ($key) = @_; |
293 | my ($key) = @_; |
|
|
294 | |
|
|
295 | if ($LOCKER{$key} == $Coro::current) {#d# |
|
|
296 | Carp::cluck "lock_wait($key) for already-acquired lock";#d# |
|
|
297 | return;#d# |
|
|
298 | }#d# |
290 | |
299 | |
291 | # wait for lock, if any |
300 | # wait for lock, if any |
292 | while ($LOCK{$key}) { |
301 | while ($LOCK{$key}) { |
293 | push @{ $LOCK{$key} }, $Coro::current; |
302 | push @{ $LOCK{$key} }, $Coro::current; |
294 | Coro::schedule; |
303 | Coro::schedule; |
… | |
… | |
300 | |
309 | |
301 | # wait, to be sure we are not locked |
310 | # wait, to be sure we are not locked |
302 | lock_wait $key; |
311 | lock_wait $key; |
303 | |
312 | |
304 | $LOCK{$key} = []; |
313 | $LOCK{$key} = []; |
|
|
314 | $LOCKER{$key} = $Coro::current;#d# |
305 | |
315 | |
306 | Coro::guard { |
316 | Coro::guard { |
|
|
317 | delete $LOCKER{$key};#d# |
307 | # wake up all waiters, to be on the safe side |
318 | # wake up all waiters, to be on the safe side |
308 | $_->ready for @{ delete $LOCK{$key} }; |
319 | $_->ready for @{ delete $LOCK{$key} }; |
309 | } |
320 | } |
310 | } |
321 | } |
311 | |
322 | |
… | |
… | |
478 | sub fork_call(&@) { |
489 | sub fork_call(&@) { |
479 | my ($cb, @args) = @_; |
490 | my ($cb, @args) = @_; |
480 | |
491 | |
481 | # we seemingly have to make a local copy of the whole thing, |
492 | # we seemingly have to make a local copy of the whole thing, |
482 | # otherwise perl prematurely frees the stuff :/ |
493 | # otherwise perl prematurely frees the stuff :/ |
483 | # TODO: investigate and fix (liekly this will be rather laborious) |
494 | # TODO: investigate and fix (likely this will be rather laborious) |
484 | |
495 | |
485 | my @res = Coro::Util::fork_eval { |
496 | my @res = Coro::Util::fork_eval { |
486 | reset_signals; |
497 | reset_signals; |
487 | &$cb |
498 | &$cb |
488 | }, @args; |
499 | }, @args; |
… | |
… | |
575 | if (1) { |
586 | if (1) { |
576 | $md5 = |
587 | $md5 = |
577 | join "\x00", |
588 | join "\x00", |
578 | $processversion, |
589 | $processversion, |
579 | map { |
590 | map { |
580 | Coro::cede; |
591 | cf::cede_to_tick; |
581 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
592 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
582 | } 0.. $#$src; |
593 | } 0.. $#$src; |
583 | |
594 | |
584 | |
595 | |
585 | my $dbmd5 = db_get cache => "$id/md5"; |
596 | my $dbmd5 = db_get cache => "$id/md5"; |
… | |
… | |
1001 | }, |
1012 | }, |
1002 | ); |
1013 | ); |
1003 | |
1014 | |
1004 | sub object_freezer_save { |
1015 | sub object_freezer_save { |
1005 | my ($filename, $rdata, $objs) = @_; |
1016 | my ($filename, $rdata, $objs) = @_; |
|
|
1017 | |
|
|
1018 | my $guard = cf::lock_acquire "io"; |
1006 | |
1019 | |
1007 | sync_job { |
1020 | sync_job { |
1008 | if (length $$rdata) { |
1021 | if (length $$rdata) { |
1009 | warn sprintf "saving %s (%d,%d)\n", |
1022 | warn sprintf "saving %s (%d,%d)\n", |
1010 | $filename, length $$rdata, scalar @$objs; |
1023 | $filename, length $$rdata, scalar @$objs; |
… | |
… | |
1034 | } |
1047 | } |
1035 | } else { |
1048 | } else { |
1036 | aio_unlink $filename; |
1049 | aio_unlink $filename; |
1037 | aio_unlink "$filename.pst"; |
1050 | aio_unlink "$filename.pst"; |
1038 | } |
1051 | } |
1039 | } |
1052 | }; |
|
|
1053 | |
|
|
1054 | undef $guard; |
1040 | } |
1055 | } |
1041 | |
1056 | |
1042 | sub object_freezer_as_string { |
1057 | sub object_freezer_as_string { |
1043 | my ($rdata, $objs) = @_; |
1058 | my ($rdata, $objs) = @_; |
1044 | |
1059 | |
… | |
… | |
1049 | |
1064 | |
1050 | sub object_thawer_load { |
1065 | sub object_thawer_load { |
1051 | my ($filename) = @_; |
1066 | my ($filename) = @_; |
1052 | |
1067 | |
1053 | my ($data, $av); |
1068 | my ($data, $av); |
|
|
1069 | |
|
|
1070 | my $guard = cf::lock_acquire "io"; |
1054 | |
1071 | |
1055 | (aio_load $filename, $data) >= 0 |
1072 | (aio_load $filename, $data) >= 0 |
1056 | or return; |
1073 | or return; |
1057 | |
1074 | |
1058 | unless (aio_stat "$filename.pst") { |
1075 | unless (aio_stat "$filename.pst") { |
1059 | (aio_load "$filename.pst", $av) >= 0 |
1076 | (aio_load "$filename.pst", $av) >= 0 |
1060 | or return; |
1077 | or return; |
|
|
1078 | |
|
|
1079 | undef $guard; |
1061 | $av = eval { (Storable::thaw $av)->{objs} }; |
1080 | $av = eval { (Storable::thaw $av)->{objs} }; |
1062 | } |
1081 | } |
1063 | |
1082 | |
1064 | warn sprintf "loading %s (%d)\n", |
1083 | warn sprintf "loading %s (%d)\n", |
1065 | $filename, length $data, scalar @{$av || []}; |
1084 | $filename, length $data, scalar @{$av || []}; |
|
|
1085 | |
1066 | return ($data, $av); |
1086 | ($data, $av) |
1067 | } |
1087 | } |
1068 | |
1088 | |
1069 | =head2 COMMAND CALLBACKS |
1089 | =head2 COMMAND CALLBACKS |
1070 | |
1090 | |
1071 | =over 4 |
1091 | =over 4 |
… | |
… | |
1149 | my ($type, $reply, @payload) = |
1169 | my ($type, $reply, @payload) = |
1150 | "ARRAY" eq ref $msg |
1170 | "ARRAY" eq ref $msg |
1151 | ? @$msg |
1171 | ? @$msg |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1172 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1153 | |
1173 | |
|
|
1174 | my @reply; |
|
|
1175 | |
1154 | if (my $cb = $EXTCMD{$type}) { |
1176 | if (my $cb = $EXTCMD{$type}) { |
1155 | my @reply = $cb->($pl, @payload); |
1177 | @reply = $cb->($pl, @payload); |
1156 | |
|
|
1157 | $pl->ext_reply ($reply, @reply) |
|
|
1158 | if $reply; |
|
|
1159 | } |
1178 | } |
|
|
1179 | |
|
|
1180 | $pl->ext_reply ($reply, @reply) |
|
|
1181 | if $reply; |
|
|
1182 | |
1160 | } else { |
1183 | } else { |
1161 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1184 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1162 | } |
1185 | } |
1163 | |
1186 | |
1164 | cf::override; |
1187 | cf::override; |
… | |
… | |
1254 | |
1277 | |
1255 | =head3 cf::player |
1278 | =head3 cf::player |
1256 | |
1279 | |
1257 | =over 4 |
1280 | =over 4 |
1258 | |
1281 | |
|
|
1282 | =item cf::player::num_playing |
|
|
1283 | |
|
|
1284 | Returns the official number of playing players, as per the Crossfire metaserver rules. |
|
|
1285 | |
|
|
1286 | =cut |
|
|
1287 | |
|
|
1288 | sub num_playing { |
|
|
1289 | scalar grep |
|
|
1290 | $_->ob->map |
|
|
1291 | && !$_->hidden |
|
|
1292 | && !$_->ob->flag (cf::FLAG_WIZ), |
|
|
1293 | cf::player::list |
|
|
1294 | } |
|
|
1295 | |
1259 | =item cf::player::find $login |
1296 | =item cf::player::find $login |
1260 | |
1297 | |
1261 | Returns the given player object, loading it if necessary (might block). |
1298 | Returns the given player object, loading it if necessary (might block). |
1262 | |
1299 | |
1263 | =cut |
1300 | =cut |
… | |
… | |
1298 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1335 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1299 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1336 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1300 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1337 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1301 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1338 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1302 | |
1339 | |
1303 | my $pl = load_pl path $login |
1340 | my $f = new_from_file cf::object::thawer path $login |
1304 | or return; |
1341 | or return; |
|
|
1342 | |
|
|
1343 | $f->next; |
|
|
1344 | my $pl = cf::player::load_pl $f |
|
|
1345 | or return; |
|
|
1346 | local $cf::PLAYER_LOADING{$login} = $pl; |
|
|
1347 | $f->resolve_delayed_derefs; |
1305 | $cf::PLAYER{$login} = $pl |
1348 | $cf::PLAYER{$login} = $pl |
1306 | } |
1349 | } |
1307 | } |
1350 | } |
1308 | } |
1351 | } |
1309 | |
1352 | |
… | |
… | |
1319 | |
1362 | |
1320 | aio_mkdir playerdir $pl, 0770; |
1363 | aio_mkdir playerdir $pl, 0770; |
1321 | $pl->{last_save} = $cf::RUNTIME; |
1364 | $pl->{last_save} = $cf::RUNTIME; |
1322 | |
1365 | |
1323 | $pl->save_pl ($path); |
1366 | $pl->save_pl ($path); |
1324 | Coro::cede; |
1367 | cf::cede_to_tick; |
1325 | } |
1368 | } |
1326 | |
1369 | |
1327 | sub new($) { |
1370 | sub new($) { |
1328 | my ($login) = @_; |
1371 | my ($login) = @_; |
1329 | |
1372 | |
… | |
… | |
1407 | or return []; |
1450 | or return []; |
1408 | |
1451 | |
1409 | my @logins; |
1452 | my @logins; |
1410 | |
1453 | |
1411 | for my $login (@$dirs) { |
1454 | for my $login (@$dirs) { |
|
|
1455 | my $path = path $login; |
|
|
1456 | |
|
|
1457 | # a .pst is a dead give-away for a valid player |
|
|
1458 | unless (-e "$path.pst") { |
1412 | my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; |
1459 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1413 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1460 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1414 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1461 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
|
|
1462 | } |
1415 | |
1463 | |
1416 | utf8::decode $login; |
1464 | utf8::decode $login; |
1417 | push @logins, $login; |
1465 | push @logins, $login; |
1418 | } |
1466 | } |
1419 | |
1467 | |
… | |
… | |
1457 | sub expand_cfpod { |
1505 | sub expand_cfpod { |
1458 | ((my $self), (local $_)) = @_; |
1506 | ((my $self), (local $_)) = @_; |
1459 | |
1507 | |
1460 | # escape & and < |
1508 | # escape & and < |
1461 | s/&/&/g; |
1509 | s/&/&/g; |
1462 | s/(?<![BIUGH])</</g; |
1510 | s/(?<![BIUGHT])</</g; |
1463 | |
1511 | |
1464 | # this is buggy, it needs to properly take care of nested <'s |
1512 | # this is buggy, it needs to properly take care of nested <'s |
1465 | |
1513 | |
1466 | 1 while |
1514 | 1 while |
1467 | # replace B<>, I<>, U<> etc. |
1515 | # replace B<>, I<>, U<> etc. |
1468 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1516 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1469 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1517 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1470 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1518 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1519 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1471 | # replace G<male|female> tags |
1520 | # replace G<male|female> tags |
1472 | || s{G<([^>|]*)\|([^>]*)>}{ |
1521 | || s{G<([^>|]*)\|([^>]*)>}{ |
1473 | $self->gender ? $2 : $1 |
1522 | $self->gender ? $2 : $1 |
1474 | }ge |
1523 | }ge |
1475 | # replace H<hint text> |
1524 | # replace H<hint text> |
… | |
… | |
1505 | =cut |
1554 | =cut |
1506 | |
1555 | |
1507 | sub ext_reply($$@) { |
1556 | sub ext_reply($$@) { |
1508 | my ($self, $id, @msg) = @_; |
1557 | my ($self, $id, @msg) = @_; |
1509 | |
1558 | |
1510 | if ($self->ns->extcmd == 2) { |
1559 | $self->ns->ext_reply ($id, @msg) |
1511 | $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg])); |
|
|
1512 | } elsif ($self->ns->extcmd == 1) { |
|
|
1513 | #TODO: version 1, remove |
|
|
1514 | unshift @msg, msgtype => "reply", msgid => $id; |
|
|
1515 | $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg})); |
|
|
1516 | } |
|
|
1517 | } |
1560 | } |
1518 | |
1561 | |
1519 | =item $player->ext_msg ($type, @msg) |
1562 | =item $player->ext_msg ($type, @msg) |
1520 | |
1563 | |
1521 | Sends an ext event to the client. |
1564 | Sends an ext event to the client. |
… | |
… | |
1749 | |
1792 | |
1750 | sub load_header_from($) { |
1793 | sub load_header_from($) { |
1751 | my ($self, $path) = @_; |
1794 | my ($self, $path) = @_; |
1752 | |
1795 | |
1753 | utf8::encode $path; |
1796 | utf8::encode $path; |
1754 | #aio_open $path, O_RDONLY, 0 |
1797 | my $f = new_from_file cf::object::thawer $path |
1755 | # or return; |
|
|
1756 | |
|
|
1757 | $self->_load_header ($path) |
|
|
1758 | or return; |
1798 | or return; |
|
|
1799 | |
|
|
1800 | $self->_load_header ($f) |
|
|
1801 | or return; |
|
|
1802 | |
|
|
1803 | local $MAP_LOADING{$self->{path}} = $self; |
|
|
1804 | $f->resolve_delayed_derefs; |
1759 | |
1805 | |
1760 | $self->{load_path} = $path; |
1806 | $self->{load_path} = $path; |
1761 | |
1807 | |
1762 | 1 |
1808 | 1 |
1763 | } |
1809 | } |
… | |
… | |
1817 | sub find { |
1863 | sub find { |
1818 | my ($path, $origin) = @_; |
1864 | my ($path, $origin) = @_; |
1819 | |
1865 | |
1820 | $path = normalise $path, $origin && $origin->path; |
1866 | $path = normalise $path, $origin && $origin->path; |
1821 | |
1867 | |
|
|
1868 | cf::lock_wait "map_data:$path";#d#remove |
1822 | cf::lock_wait "map_find:$path"; |
1869 | cf::lock_wait "map_find:$path"; |
1823 | |
1870 | |
1824 | $cf::MAP{$path} || do { |
1871 | $cf::MAP{$path} || do { |
1825 | my $guard = cf::lock_acquire "map_find:$path"; |
1872 | my $guard1 = cf::lock_acquire "map_find:$path"; |
|
|
1873 | my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1874 | |
1826 | my $map = new_from_path cf::map $path |
1875 | my $map = new_from_path cf::map $path |
1827 | or return; |
1876 | or return; |
1828 | |
1877 | |
1829 | $map->{last_save} = $cf::RUNTIME; |
1878 | $map->{last_save} = $cf::RUNTIME; |
1830 | |
1879 | |
… | |
… | |
1832 | or return; |
1881 | or return; |
1833 | |
1882 | |
1834 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1883 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1835 | # doing this can freeze the server in a sync job, obviously |
1884 | # doing this can freeze the server in a sync job, obviously |
1836 | #$cf::WAIT_FOR_TICK->wait; |
1885 | #$cf::WAIT_FOR_TICK->wait; |
|
|
1886 | undef $guard1; |
|
|
1887 | undef $guard2; |
1837 | $map->reset; |
1888 | $map->reset; |
1838 | undef $guard; |
|
|
1839 | return find $path; |
1889 | return find $path; |
1840 | } |
1890 | } |
1841 | |
1891 | |
1842 | $cf::MAP{$path} = $map |
1892 | $cf::MAP{$path} = $map |
1843 | } |
1893 | } |
… | |
… | |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1902 | local $self->{deny_reset} = 1; # loading can take a long time |
1853 | |
1903 | |
1854 | my $path = $self->{path}; |
1904 | my $path = $self->{path}; |
1855 | |
1905 | |
1856 | { |
1906 | { |
1857 | my $guard = cf::lock_acquire "map_load:$path"; |
1907 | my $guard = cf::lock_acquire "map_data:$path"; |
1858 | |
1908 | |
|
|
1909 | return unless $self->valid; |
1859 | return if $self->in_memory != cf::MAP_SWAPPED; |
1910 | return unless $self->in_memory == cf::MAP_SWAPPED; |
1860 | |
1911 | |
1861 | $self->in_memory (cf::MAP_LOADING); |
1912 | $self->in_memory (cf::MAP_LOADING); |
1862 | |
1913 | |
1863 | $self->alloc; |
1914 | $self->alloc; |
1864 | |
1915 | |
1865 | $self->pre_load; |
1916 | $self->pre_load; |
1866 | Coro::cede; |
1917 | cf::cede_to_tick; |
1867 | |
1918 | |
|
|
1919 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
|
|
1920 | $f->skip_block; |
1868 | $self->_load_objects ($self->{load_path}, 1) |
1921 | $self->_load_objects ($f) |
1869 | or return; |
1922 | or return; |
1870 | |
1923 | |
1871 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1924 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1872 | if delete $self->{load_original}; |
1925 | if delete $self->{load_original}; |
1873 | |
1926 | |
1874 | if (my $uniq = $self->uniq_path) { |
1927 | if (my $uniq = $self->uniq_path) { |
1875 | utf8::encode $uniq; |
1928 | utf8::encode $uniq; |
1876 | if (aio_open $uniq, O_RDONLY, 0) { |
1929 | unless (aio_stat $uniq) { |
|
|
1930 | if (my $f = new_from_file cf::object::thawer $uniq) { |
1877 | $self->clear_unique_items; |
1931 | $self->clear_unique_items; |
1878 | $self->_load_objects ($uniq, 0); |
1932 | $self->_load_objects ($f); |
|
|
1933 | $f->resolve_delayed_derefs; |
|
|
1934 | } |
1879 | } |
1935 | } |
1880 | } |
1936 | } |
1881 | |
1937 | |
1882 | Coro::cede; |
1938 | $f->resolve_delayed_derefs; |
|
|
1939 | |
|
|
1940 | cf::cede_to_tick; |
1883 | # now do the right thing for maps |
1941 | # now do the right thing for maps |
1884 | $self->link_multipart_objects; |
1942 | $self->link_multipart_objects; |
1885 | $self->difficulty ($self->estimate_difficulty) |
1943 | $self->difficulty ($self->estimate_difficulty) |
1886 | unless $self->difficulty; |
1944 | unless $self->difficulty; |
1887 | Coro::cede; |
1945 | cf::cede_to_tick; |
1888 | |
1946 | |
1889 | unless ($self->{deny_activate}) { |
1947 | unless ($self->{deny_activate}) { |
1890 | $self->decay_objects; |
1948 | $self->decay_objects; |
1891 | $self->fix_auto_apply; |
1949 | $self->fix_auto_apply; |
1892 | $self->update_buttons; |
1950 | $self->update_buttons; |
1893 | Coro::cede; |
1951 | cf::cede_to_tick; |
1894 | $self->set_darkness_map; |
1952 | $self->set_darkness_map; |
1895 | Coro::cede; |
1953 | cf::cede_to_tick; |
1896 | $self->activate; |
1954 | $self->activate; |
1897 | } |
1955 | } |
1898 | |
1956 | |
1899 | $self->{last_save} = $cf::RUNTIME; |
1957 | $self->{last_save} = $cf::RUNTIME; |
1900 | $self->last_access ($cf::RUNTIME); |
1958 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1950 | } |
2008 | } |
1951 | |
2009 | |
1952 | sub do_load_sync { |
2010 | sub do_load_sync { |
1953 | my ($map) = @_; |
2011 | my ($map) = @_; |
1954 | |
2012 | |
|
|
2013 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
2014 | if $Coro::current == $Coro::main; |
|
|
2015 | |
1955 | cf::sync_job { $map->load }; |
2016 | cf::sync_job { $map->load }; |
1956 | } |
2017 | } |
1957 | |
2018 | |
1958 | our %MAP_PREFETCH; |
2019 | our %MAP_PREFETCH; |
1959 | our $MAP_PREFETCHER = undef; |
2020 | our $MAP_PREFETCHER = undef; |
1960 | |
2021 | |
1961 | sub find_async { |
2022 | sub find_async { |
1962 | my ($path, $origin) = @_; |
2023 | my ($path, $origin, $load) = @_; |
1963 | |
2024 | |
1964 | $path = normalise $path, $origin && $origin->{path}; |
2025 | $path = normalise $path, $origin && $origin->{path}; |
1965 | |
2026 | |
1966 | if (my $map = $cf::MAP{$path}) { |
2027 | if (my $map = $cf::MAP{$path}) { |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
2028 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1968 | } |
2029 | } |
1969 | |
2030 | |
1970 | undef $MAP_PREFETCH{$path}; |
2031 | $MAP_PREFETCH{$path} |= $load; |
|
|
2032 | |
1971 | $MAP_PREFETCHER ||= cf::async { |
2033 | $MAP_PREFETCHER ||= cf::async { |
1972 | while (%MAP_PREFETCH) { |
2034 | while (%MAP_PREFETCH) { |
1973 | for my $path (keys %MAP_PREFETCH) { |
2035 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1974 | if (my $map = find $path) { |
2036 | if (my $map = find $k) { |
1975 | $map->load; |
2037 | $map->load if $v; |
1976 | } |
2038 | } |
1977 | |
2039 | |
1978 | delete $MAP_PREFETCH{$path}; |
2040 | delete $MAP_PREFETCH{$k}; |
1979 | } |
2041 | } |
1980 | } |
2042 | } |
1981 | undef $MAP_PREFETCHER; |
2043 | undef $MAP_PREFETCHER; |
1982 | }; |
2044 | }; |
1983 | $MAP_PREFETCHER->prio (6); |
2045 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1986 | } |
2048 | } |
1987 | |
2049 | |
1988 | sub save { |
2050 | sub save { |
1989 | my ($self) = @_; |
2051 | my ($self) = @_; |
1990 | |
2052 | |
1991 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2053 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1992 | |
2054 | |
1993 | $self->{last_save} = $cf::RUNTIME; |
2055 | $self->{last_save} = $cf::RUNTIME; |
1994 | |
2056 | |
1995 | return unless $self->dirty; |
2057 | return unless $self->dirty; |
1996 | |
2058 | |
… | |
… | |
2019 | my ($self) = @_; |
2081 | my ($self) = @_; |
2020 | |
2082 | |
2021 | # save first because save cedes |
2083 | # save first because save cedes |
2022 | $self->save; |
2084 | $self->save; |
2023 | |
2085 | |
2024 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2086 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2025 | |
2087 | |
2026 | return if $self->players; |
2088 | return if $self->players; |
2027 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2089 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2028 | return if $self->{deny_save}; |
2090 | return if $self->{deny_save}; |
2029 | |
2091 | |
|
|
2092 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2093 | |
|
|
2094 | $self->deactivate; |
|
|
2095 | $_->clear_links_to ($self) for values %cf::MAP; |
2030 | $self->clear; |
2096 | $self->clear; |
2031 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2032 | } |
2097 | } |
2033 | |
2098 | |
2034 | sub reset_at { |
2099 | sub reset_at { |
2035 | my ($self) = @_; |
2100 | my ($self) = @_; |
2036 | |
2101 | |
… | |
… | |
2068 | if $uniq; |
2133 | if $uniq; |
2069 | } |
2134 | } |
2070 | |
2135 | |
2071 | delete $cf::MAP{$self->path}; |
2136 | delete $cf::MAP{$self->path}; |
2072 | |
2137 | |
|
|
2138 | $self->deactivate; |
|
|
2139 | $_->clear_links_to ($self) for values %cf::MAP; |
2073 | $self->clear; |
2140 | $self->clear; |
2074 | |
|
|
2075 | $_->clear_links_to ($self) for values %cf::MAP; |
|
|
2076 | |
2141 | |
2077 | $self->unlink_save; |
2142 | $self->unlink_save; |
2078 | $self->destroy; |
2143 | $self->destroy; |
2079 | } |
2144 | } |
2080 | |
2145 | |
2081 | my $nuke_counter = "aaaa"; |
2146 | my $nuke_counter = "aaaa"; |
2082 | |
2147 | |
2083 | sub nuke { |
2148 | sub nuke { |
2084 | my ($self) = @_; |
2149 | my ($self) = @_; |
2085 | |
2150 | |
|
|
2151 | { |
|
|
2152 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2153 | |
2086 | delete $cf::MAP{$self->path}; |
2154 | delete $cf::MAP{$self->path}; |
2087 | |
2155 | |
2088 | $self->unlink_save; |
2156 | $self->unlink_save; |
2089 | |
2157 | |
2090 | bless $self, "cf::map"; |
2158 | bless $self, "cf::map"; |
2091 | delete $self->{deny_reset}; |
2159 | delete $self->{deny_reset}; |
2092 | $self->{deny_save} = 1; |
2160 | $self->{deny_save} = 1; |
2093 | $self->reset_timeout (1); |
2161 | $self->reset_timeout (1); |
2094 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2162 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2095 | |
2163 | |
2096 | $cf::MAP{$self->path} = $self; |
2164 | $cf::MAP{$self->path} = $self; |
|
|
2165 | } |
2097 | |
2166 | |
2098 | $self->reset; # polite request, might not happen |
2167 | $self->reset; # polite request, might not happen |
2099 | } |
2168 | } |
2100 | |
2169 | |
2101 | =item $maps = cf::map::tmp_maps |
2170 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2177 | |
2246 | |
2178 | sub inv_recursive { |
2247 | sub inv_recursive { |
2179 | inv_recursive_ inv $_[0] |
2248 | inv_recursive_ inv $_[0] |
2180 | } |
2249 | } |
2181 | |
2250 | |
|
|
2251 | =item $ref = $ob->ref |
|
|
2252 | |
|
|
2253 | creates and returns a persistent reference to an objetc that can be stored as a string. |
|
|
2254 | |
|
|
2255 | =item $ob = cf::object::deref ($refstring) |
|
|
2256 | |
|
|
2257 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
|
|
2258 | even if the object actually exists. May block. |
|
|
2259 | |
|
|
2260 | =cut |
|
|
2261 | |
|
|
2262 | sub deref { |
|
|
2263 | my ($ref) = @_; |
|
|
2264 | |
|
|
2265 | # temporary compatibility#TODO#remove |
|
|
2266 | $ref =~ s{^<}{player/<}; |
|
|
2267 | |
|
|
2268 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
|
|
2269 | my ($uuid, $name) = ($1, $2); |
|
|
2270 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
|
|
2271 | or return; |
|
|
2272 | $pl->ob->uuid eq $uuid |
|
|
2273 | or return; |
|
|
2274 | |
|
|
2275 | $pl->ob |
|
|
2276 | } else { |
|
|
2277 | warn "$ref: cannot resolve object reference\n"; |
|
|
2278 | undef |
|
|
2279 | } |
|
|
2280 | } |
|
|
2281 | |
2182 | package cf; |
2282 | package cf; |
2183 | |
2283 | |
2184 | =back |
2284 | =back |
2185 | |
2285 | |
2186 | =head3 cf::object::player |
2286 | =head3 cf::object::player |
… | |
… | |
2495 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2595 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2496 | the message unless the client supports the msg packet. |
2596 | the message unless the client supports the msg packet. |
2497 | |
2597 | |
2498 | =cut |
2598 | =cut |
2499 | |
2599 | |
|
|
2600 | our %CHANNEL = ( |
|
|
2601 | "c/identify" => { |
|
|
2602 | id => "identify", |
|
|
2603 | title => "Identify", |
|
|
2604 | reply => undef, |
|
|
2605 | tooltip => "Items recently identified", |
|
|
2606 | }, |
|
|
2607 | "c/examine" => { |
|
|
2608 | id => "examine", |
|
|
2609 | title => "Examine", |
|
|
2610 | reply => undef, |
|
|
2611 | tooltip => "Signs and other items you examined", |
|
|
2612 | }, |
|
|
2613 | ); |
|
|
2614 | |
2500 | sub cf::client::send_msg { |
2615 | sub cf::client::send_msg { |
2501 | my ($self, $channel, $msg, $color, @extra) = @_; |
2616 | my ($self, $channel, $msg, $color, @extra) = @_; |
2502 | |
2617 | |
2503 | $msg = $self->pl->expand_cfpod ($msg); |
2618 | $msg = $self->pl->expand_cfpod ($msg); |
2504 | |
2619 | |
2505 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2620 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2621 | |
|
|
2622 | # check predefined channels, for the benefit of C |
|
|
2623 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
2506 | |
2624 | |
2507 | if (ref $channel) { |
2625 | if (ref $channel) { |
2508 | # send meta info to client, if not yet sent |
2626 | # send meta info to client, if not yet sent |
2509 | unless (exists $self->{channel}{$channel->{id}}) { |
2627 | unless (exists $self->{channel}{$channel->{id}}) { |
2510 | $self->{channel}{$channel->{id}} = $channel; |
2628 | $self->{channel}{$channel->{id}} = $channel; |
2511 | $self->ext_msg (channel_info => $channel); |
2629 | $self->ext_msg (channel_info => $channel) |
|
|
2630 | if $self->can_msg; |
2512 | } |
2631 | } |
2513 | |
2632 | |
2514 | $channel = $channel->{id}; |
2633 | $channel = $channel->{id}; |
2515 | } |
2634 | } |
2516 | |
2635 | |
… | |
… | |
2557 | =cut |
2676 | =cut |
2558 | |
2677 | |
2559 | sub cf::client::ext_msg($$@) { |
2678 | sub cf::client::ext_msg($$@) { |
2560 | my ($self, $type, @msg) = @_; |
2679 | my ($self, $type, @msg) = @_; |
2561 | |
2680 | |
2562 | my $extcmd = $self->extcmd; |
|
|
2563 | |
|
|
2564 | if ($extcmd == 2) { |
2681 | if ($self->extcmd == 2) { |
2565 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2682 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2566 | } elsif ($extcmd == 1) { # TODO: remove |
2683 | } elsif ($self->extcmd == 1) { # TODO: remove |
2567 | push @msg, msgtype => "event_$type"; |
2684 | push @msg, msgtype => "event_$type"; |
|
|
2685 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2686 | } |
|
|
2687 | } |
|
|
2688 | |
|
|
2689 | =item $client->ext_reply ($msgid, @msg) |
|
|
2690 | |
|
|
2691 | Sends an ext reply to the client. |
|
|
2692 | |
|
|
2693 | =cut |
|
|
2694 | |
|
|
2695 | sub cf::client::ext_reply($$@) { |
|
|
2696 | my ($self, $id, @msg) = @_; |
|
|
2697 | |
|
|
2698 | if ($self->extcmd == 2) { |
|
|
2699 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2700 | } elsif ($self->extcmd == 1) { |
|
|
2701 | #TODO: version 1, remove |
|
|
2702 | unshift @msg, msgtype => "reply", msgid => $id; |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2703 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | } |
2704 | } |
2570 | } |
2705 | } |
2571 | |
2706 | |
2572 | =item $success = $client->query ($flags, "text", \&cb) |
2707 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2634 | my ($type, $reply, @payload) = |
2769 | my ($type, $reply, @payload) = |
2635 | "ARRAY" eq ref $msg |
2770 | "ARRAY" eq ref $msg |
2636 | ? @$msg |
2771 | ? @$msg |
2637 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2772 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2638 | |
2773 | |
|
|
2774 | my @reply; |
|
|
2775 | |
2639 | if (my $cb = $EXTICMD{$type}) { |
2776 | if (my $cb = $EXTICMD{$type}) { |
2640 | my @reply = $cb->($ns, @payload); |
2777 | @reply = $cb->($ns, @payload); |
2641 | |
|
|
2642 | $ns->ext_reply ($reply, @reply) |
|
|
2643 | if $reply; |
|
|
2644 | } |
2778 | } |
|
|
2779 | |
|
|
2780 | $ns->ext_reply ($reply, @reply) |
|
|
2781 | if $reply; |
|
|
2782 | |
2645 | } else { |
2783 | } else { |
2646 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2784 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2647 | } |
2785 | } |
2648 | |
2786 | |
2649 | cf::override; |
2787 | cf::override; |
… | |
… | |
2710 | |
2848 | |
2711 | The following functions and methods are available within a safe environment: |
2849 | The following functions and methods are available within a safe environment: |
2712 | |
2850 | |
2713 | cf::object |
2851 | cf::object |
2714 | contr pay_amount pay_player map x y force_find force_add |
2852 | contr pay_amount pay_player map x y force_find force_add |
2715 | insert remove name archname title slaying race |
2853 | insert remove name archname title slaying race decrease_ob_nr |
2716 | |
2854 | |
2717 | cf::object::player |
2855 | cf::object::player |
2718 | player |
2856 | player |
2719 | |
2857 | |
2720 | cf::player |
2858 | cf::player |
… | |
… | |
2725 | |
2863 | |
2726 | =cut |
2864 | =cut |
2727 | |
2865 | |
2728 | for ( |
2866 | for ( |
2729 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2867 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2730 | insert remove inv name archname title slaying race)], |
2868 | insert remove inv name archname title slaying race |
|
|
2869 | decrease_ob_nr)], |
2731 | ["cf::object::player" => qw(player)], |
2870 | ["cf::object::player" => qw(player)], |
2732 | ["cf::player" => qw(peaceful)], |
2871 | ["cf::player" => qw(peaceful)], |
2733 | ["cf::map" => qw(trigger)], |
2872 | ["cf::map" => qw(trigger)], |
2734 | ) { |
2873 | ) { |
2735 | no strict 'refs'; |
2874 | no strict 'refs'; |
… | |
… | |
2811 | # the server's init and main functions |
2950 | # the server's init and main functions |
2812 | |
2951 | |
2813 | sub load_facedata($) { |
2952 | sub load_facedata($) { |
2814 | my ($path) = @_; |
2953 | my ($path) = @_; |
2815 | |
2954 | |
|
|
2955 | # HACK to clear player env face cache, we need some signal framework |
|
|
2956 | # for this (global event?) |
|
|
2957 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2958 | |
|
|
2959 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
2960 | |
2816 | warn "loading facedata from $path\n"; |
2961 | warn "loading facedata from $path\n"; |
2817 | |
2962 | |
2818 | my $facedata; |
2963 | my $facedata; |
2819 | 0 < aio_load $path, $facedata |
2964 | 0 < aio_load $path, $facedata |
2820 | or die "$path: $!"; |
2965 | or die "$path: $!"; |
2821 | |
2966 | |
2822 | $facedata = Coro::Storable::thaw $facedata; |
2967 | $facedata = Coro::Storable::thaw $facedata; |
2823 | |
2968 | |
2824 | $facedata->{version} == 2 |
2969 | $facedata->{version} == 2 |
2825 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2970 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
|
|
2971 | |
|
|
2972 | # patch in the exptable |
|
|
2973 | $facedata->{resource}{"res/exp_table"} = { |
|
|
2974 | type => FT_RSRC, |
|
|
2975 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
2976 | }; |
|
|
2977 | cf::cede_to_tick; |
2826 | |
2978 | |
2827 | { |
2979 | { |
2828 | my $faces = $facedata->{faceinfo}; |
2980 | my $faces = $facedata->{faceinfo}; |
2829 | |
2981 | |
2830 | while (my ($face, $info) = each %$faces) { |
2982 | while (my ($face, $info) = each %$faces) { |
2831 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2983 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2832 | cf::face::set_visibility $idx, $info->{visibility}; |
2984 | cf::face::set_visibility $idx, $info->{visibility}; |
2833 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2985 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2834 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2986 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2835 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2987 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2836 | |
2988 | |
2837 | cf::cede_to_tick; |
2989 | cf::cede_to_tick; |
2838 | } |
2990 | } |
2839 | |
2991 | |
2840 | while (my ($face, $info) = each %$faces) { |
2992 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
2865 | |
3017 | |
2866 | { |
3018 | { |
2867 | # TODO: for gcfclient pleasure, we should give resources |
3019 | # TODO: for gcfclient pleasure, we should give resources |
2868 | # that gcfclient doesn't grok a >10000 face index. |
3020 | # that gcfclient doesn't grok a >10000 face index. |
2869 | my $res = $facedata->{resource}; |
3021 | my $res = $facedata->{resource}; |
2870 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2871 | |
3022 | |
2872 | my $soundconf = delete $res->{"res/sound.conf"}; |
3023 | my $soundconf = delete $res->{"res/sound.conf"}; |
2873 | |
3024 | |
2874 | while (my ($name, $info) = each %$res) { |
3025 | while (my ($name, $info) = each %$res) { |
2875 | my $meta = $enc->encode ({ |
|
|
2876 | name => $name, |
|
|
2877 | %{ $info->{meta} || {} }, |
|
|
2878 | }); |
|
|
2879 | |
|
|
2880 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3026 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
3027 | my $data; |
2881 | |
3028 | |
2882 | if ($info->{type} & 1) { |
3029 | if ($info->{type} & 1) { |
2883 | # prepend meta info |
3030 | # prepend meta info |
2884 | |
3031 | |
|
|
3032 | my $meta = $enc->encode ({ |
|
|
3033 | name => $name, |
|
|
3034 | %{ $info->{meta} || {} }, |
|
|
3035 | }); |
|
|
3036 | |
2885 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
3037 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2886 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
|
|
2887 | |
|
|
2888 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2889 | } else { |
3038 | } else { |
2890 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
3039 | $data = $info->{data}; |
2891 | } |
3040 | } |
2892 | |
3041 | |
|
|
3042 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2893 | cf::face::set_type $idx, $info->{type}; |
3043 | cf::face::set_type $idx, $info->{type}; |
2894 | |
3044 | |
2895 | cf::cede_to_tick; |
3045 | cf::cede_to_tick; |
2896 | } |
3046 | } |
2897 | |
3047 | |
… | |
… | |
2924 | $ns->fx_want ($k, $v); |
3074 | $ns->fx_want ($k, $v); |
2925 | } |
3075 | } |
2926 | }; |
3076 | }; |
2927 | |
3077 | |
2928 | sub reload_regions { |
3078 | sub reload_regions { |
|
|
3079 | # HACK to clear player env face cache, we need some signal framework |
|
|
3080 | # for this (global event?) |
|
|
3081 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3082 | |
2929 | load_resource_file "$MAPDIR/regions" |
3083 | load_resource_file "$MAPDIR/regions" |
2930 | or die "unable to load regions file\n"; |
3084 | or die "unable to load regions file\n"; |
2931 | |
3085 | |
2932 | for (cf::region::list) { |
3086 | for (cf::region::list) { |
2933 | $_->{match} = qr/$_->{match}/ |
3087 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2969 | |
3123 | |
2970 | sub init { |
3124 | sub init { |
2971 | reload_resources; |
3125 | reload_resources; |
2972 | } |
3126 | } |
2973 | |
3127 | |
2974 | sub cfg_load { |
3128 | sub reload_config { |
2975 | open my $fh, "<:utf8", "$CONFDIR/config" |
3129 | open my $fh, "<:utf8", "$CONFDIR/config" |
2976 | or return; |
3130 | or return; |
2977 | |
3131 | |
2978 | local $/; |
3132 | local $/; |
2979 | *CFG = YAML::Syck::Load <$fh>; |
3133 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
2999 | (async { |
3153 | (async { |
3000 | Event::one_event; |
3154 | Event::one_event; |
3001 | })->prio (Coro::PRIO_MAX); |
3155 | })->prio (Coro::PRIO_MAX); |
3002 | }; |
3156 | }; |
3003 | |
3157 | |
3004 | cfg_load; |
3158 | reload_config; |
3005 | db_init; |
3159 | db_init; |
3006 | load_extensions; |
3160 | load_extensions; |
3007 | |
3161 | |
3008 | $TICK_WATCHER->start; |
3162 | $TICK_WATCHER->start; |
3009 | Event::loop; |
3163 | Event::loop; |
… | |
… | |
3202 | warn "reloading cf.pm"; |
3356 | warn "reloading cf.pm"; |
3203 | require cf; |
3357 | require cf; |
3204 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3358 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3205 | |
3359 | |
3206 | warn "loading config and database again"; |
3360 | warn "loading config and database again"; |
3207 | cf::cfg_load; |
3361 | cf::reload_config; |
3208 | |
3362 | |
3209 | warn "loading extensions"; |
3363 | warn "loading extensions"; |
3210 | cf::load_extensions; |
3364 | cf::load_extensions; |
3211 | |
3365 | |
3212 | warn "reattaching attachments to objects/players"; |
3366 | warn "reattaching attachments to objects/players"; |
… | |
… | |
3305 | or die; |
3459 | or die; |
3306 | |
3460 | |
3307 | $map->width (50); |
3461 | $map->width (50); |
3308 | $map->height (50); |
3462 | $map->height (50); |
3309 | $map->alloc; |
3463 | $map->alloc; |
3310 | $map->_load_objects ("/tmp/x.map", 1); |
3464 | $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work |
3311 | my $t = Event::time - $t; |
3465 | my $t = Event::time - $t; |
3312 | |
3466 | |
3313 | #next unless $t < 0.0013;#d# |
3467 | #next unless $t < 0.0013;#d# |
3314 | if ($t < $min) { |
3468 | if ($t < $min) { |
3315 | $min = $t; |
3469 | $min = $t; |