… | |
… | |
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 (); |
… | |
… | |
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 | |
… | |
… | |
478 | sub fork_call(&@) { |
481 | sub fork_call(&@) { |
479 | my ($cb, @args) = @_; |
482 | my ($cb, @args) = @_; |
480 | |
483 | |
481 | # we seemingly have to make a local copy of the whole thing, |
484 | # we seemingly have to make a local copy of the whole thing, |
482 | # otherwise perl prematurely frees the stuff :/ |
485 | # otherwise perl prematurely frees the stuff :/ |
483 | # TODO: investigate and fix (liekly this will be rather laborious) |
486 | # TODO: investigate and fix (likely this will be rather laborious) |
484 | |
487 | |
485 | my @res = Coro::Util::fork_eval { |
488 | my @res = Coro::Util::fork_eval { |
486 | reset_signals; |
489 | reset_signals; |
487 | &$cb |
490 | &$cb |
488 | }, @args; |
491 | }, @args; |
… | |
… | |
575 | if (1) { |
578 | if (1) { |
576 | $md5 = |
579 | $md5 = |
577 | join "\x00", |
580 | join "\x00", |
578 | $processversion, |
581 | $processversion, |
579 | map { |
582 | map { |
580 | Coro::cede; |
583 | cf::cede_to_tick; |
581 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
584 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
582 | } 0.. $#$src; |
585 | } 0.. $#$src; |
583 | |
586 | |
584 | |
587 | |
585 | my $dbmd5 = db_get cache => "$id/md5"; |
588 | my $dbmd5 = db_get cache => "$id/md5"; |
… | |
… | |
1149 | my ($type, $reply, @payload) = |
1152 | my ($type, $reply, @payload) = |
1150 | "ARRAY" eq ref $msg |
1153 | "ARRAY" eq ref $msg |
1151 | ? @$msg |
1154 | ? @$msg |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1155 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1153 | |
1156 | |
|
|
1157 | my @reply; |
|
|
1158 | |
1154 | if (my $cb = $EXTCMD{$type}) { |
1159 | if (my $cb = $EXTCMD{$type}) { |
1155 | my @reply = $cb->($pl, @payload); |
1160 | @reply = $cb->($pl, @payload); |
1156 | |
|
|
1157 | $pl->ext_reply ($reply, @reply) |
|
|
1158 | if $reply; |
|
|
1159 | } |
1161 | } |
|
|
1162 | |
|
|
1163 | $pl->ext_reply ($reply, @reply) |
|
|
1164 | if $reply; |
|
|
1165 | |
1160 | } else { |
1166 | } else { |
1161 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1167 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1162 | } |
1168 | } |
1163 | |
1169 | |
1164 | cf::override; |
1170 | cf::override; |
… | |
… | |
1319 | |
1325 | |
1320 | aio_mkdir playerdir $pl, 0770; |
1326 | aio_mkdir playerdir $pl, 0770; |
1321 | $pl->{last_save} = $cf::RUNTIME; |
1327 | $pl->{last_save} = $cf::RUNTIME; |
1322 | |
1328 | |
1323 | $pl->save_pl ($path); |
1329 | $pl->save_pl ($path); |
1324 | Coro::cede; |
1330 | cf::cede_to_tick; |
1325 | } |
1331 | } |
1326 | |
1332 | |
1327 | sub new($) { |
1333 | sub new($) { |
1328 | my ($login) = @_; |
1334 | my ($login) = @_; |
1329 | |
1335 | |
… | |
… | |
1407 | or return []; |
1413 | or return []; |
1408 | |
1414 | |
1409 | my @logins; |
1415 | my @logins; |
1410 | |
1416 | |
1411 | for my $login (@$dirs) { |
1417 | for my $login (@$dirs) { |
|
|
1418 | my $path = path $login; |
|
|
1419 | |
|
|
1420 | # a .pst is a dead give-away for a valid player |
|
|
1421 | unless (-e "$path.pst") { |
1412 | my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; |
1422 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1413 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1423 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1414 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1424 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
|
|
1425 | } |
1415 | |
1426 | |
1416 | utf8::decode $login; |
1427 | utf8::decode $login; |
1417 | push @logins, $login; |
1428 | push @logins, $login; |
1418 | } |
1429 | } |
1419 | |
1430 | |
… | |
… | |
1457 | sub expand_cfpod { |
1468 | sub expand_cfpod { |
1458 | ((my $self), (local $_)) = @_; |
1469 | ((my $self), (local $_)) = @_; |
1459 | |
1470 | |
1460 | # escape & and < |
1471 | # escape & and < |
1461 | s/&/&/g; |
1472 | s/&/&/g; |
1462 | s/(?<![BIUGH])</</g; |
1473 | s/(?<![BIUGHT])</</g; |
1463 | |
1474 | |
1464 | # this is buggy, it needs to properly take care of nested <'s |
1475 | # this is buggy, it needs to properly take care of nested <'s |
1465 | |
1476 | |
1466 | 1 while |
1477 | 1 while |
1467 | # replace B<>, I<>, U<> etc. |
1478 | # replace B<>, I<>, U<> etc. |
1468 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1479 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1469 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1480 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1470 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1481 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1482 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1471 | # replace G<male|female> tags |
1483 | # replace G<male|female> tags |
1472 | || s{G<([^>|]*)\|([^>]*)>}{ |
1484 | || s{G<([^>|]*)\|([^>]*)>}{ |
1473 | $self->gender ? $2 : $1 |
1485 | $self->gender ? $2 : $1 |
1474 | }ge |
1486 | }ge |
1475 | # replace H<hint text> |
1487 | # replace H<hint text> |
… | |
… | |
1505 | =cut |
1517 | =cut |
1506 | |
1518 | |
1507 | sub ext_reply($$@) { |
1519 | sub ext_reply($$@) { |
1508 | my ($self, $id, @msg) = @_; |
1520 | my ($self, $id, @msg) = @_; |
1509 | |
1521 | |
1510 | if ($self->ns->extcmd == 2) { |
1522 | $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 | } |
1523 | } |
1518 | |
1524 | |
1519 | =item $player->ext_msg ($type, @msg) |
1525 | =item $player->ext_msg ($type, @msg) |
1520 | |
1526 | |
1521 | Sends an ext event to the client. |
1527 | Sends an ext event to the client. |
… | |
… | |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1858 | local $self->{deny_reset} = 1; # loading can take a long time |
1853 | |
1859 | |
1854 | my $path = $self->{path}; |
1860 | my $path = $self->{path}; |
1855 | |
1861 | |
1856 | { |
1862 | { |
|
|
1863 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1857 | my $guard = cf::lock_acquire "map_load:$path"; |
1864 | my $guard2 = cf::lock_acquire "map_load:$path"; |
1858 | |
1865 | |
1859 | return if $self->in_memory != cf::MAP_SWAPPED; |
1866 | return if $self->in_memory != cf::MAP_SWAPPED; |
1860 | |
1867 | |
1861 | $self->in_memory (cf::MAP_LOADING); |
1868 | $self->in_memory (cf::MAP_LOADING); |
1862 | |
1869 | |
1863 | $self->alloc; |
1870 | $self->alloc; |
1864 | |
1871 | |
1865 | $self->pre_load; |
1872 | $self->pre_load; |
1866 | Coro::cede; |
1873 | cf::cede_to_tick; |
1867 | |
1874 | |
1868 | $self->_load_objects ($self->{load_path}, 1) |
1875 | $self->_load_objects ($self->{load_path}, 1) |
1869 | or return; |
1876 | or return; |
1870 | |
1877 | |
1871 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1878 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
… | |
… | |
1877 | $self->clear_unique_items; |
1884 | $self->clear_unique_items; |
1878 | $self->_load_objects ($uniq, 0); |
1885 | $self->_load_objects ($uniq, 0); |
1879 | } |
1886 | } |
1880 | } |
1887 | } |
1881 | |
1888 | |
1882 | Coro::cede; |
1889 | cf::cede_to_tick; |
1883 | # now do the right thing for maps |
1890 | # now do the right thing for maps |
1884 | $self->link_multipart_objects; |
1891 | $self->link_multipart_objects; |
1885 | $self->difficulty ($self->estimate_difficulty) |
1892 | $self->difficulty ($self->estimate_difficulty) |
1886 | unless $self->difficulty; |
1893 | unless $self->difficulty; |
1887 | Coro::cede; |
1894 | cf::cede_to_tick; |
1888 | |
1895 | |
1889 | unless ($self->{deny_activate}) { |
1896 | unless ($self->{deny_activate}) { |
1890 | $self->decay_objects; |
1897 | $self->decay_objects; |
1891 | $self->fix_auto_apply; |
1898 | $self->fix_auto_apply; |
1892 | $self->update_buttons; |
1899 | $self->update_buttons; |
1893 | Coro::cede; |
1900 | cf::cede_to_tick; |
1894 | $self->set_darkness_map; |
1901 | $self->set_darkness_map; |
1895 | Coro::cede; |
1902 | cf::cede_to_tick; |
1896 | $self->activate; |
1903 | $self->activate; |
1897 | } |
1904 | } |
1898 | |
1905 | |
1899 | $self->{last_save} = $cf::RUNTIME; |
1906 | $self->{last_save} = $cf::RUNTIME; |
1900 | $self->last_access ($cf::RUNTIME); |
1907 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1950 | } |
1957 | } |
1951 | |
1958 | |
1952 | sub do_load_sync { |
1959 | sub do_load_sync { |
1953 | my ($map) = @_; |
1960 | my ($map) = @_; |
1954 | |
1961 | |
|
|
1962 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1963 | if $Coro::current == $Coro::main; |
|
|
1964 | |
1955 | cf::sync_job { $map->load }; |
1965 | cf::sync_job { $map->load }; |
1956 | } |
1966 | } |
1957 | |
1967 | |
1958 | our %MAP_PREFETCH; |
1968 | our %MAP_PREFETCH; |
1959 | our $MAP_PREFETCHER = undef; |
1969 | our $MAP_PREFETCHER = undef; |
1960 | |
1970 | |
1961 | sub find_async { |
1971 | sub find_async { |
1962 | my ($path, $origin) = @_; |
1972 | my ($path, $origin, $load) = @_; |
1963 | |
1973 | |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1974 | $path = normalise $path, $origin && $origin->{path}; |
1965 | |
1975 | |
1966 | if (my $map = $cf::MAP{$path}) { |
1976 | if (my $map = $cf::MAP{$path}) { |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1977 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1968 | } |
1978 | } |
1969 | |
1979 | |
1970 | undef $MAP_PREFETCH{$path}; |
1980 | $MAP_PREFETCH{$path} |= $load; |
|
|
1981 | |
1971 | $MAP_PREFETCHER ||= cf::async { |
1982 | $MAP_PREFETCHER ||= cf::async { |
1972 | while (%MAP_PREFETCH) { |
1983 | while (%MAP_PREFETCH) { |
1973 | for my $path (keys %MAP_PREFETCH) { |
1984 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1974 | if (my $map = find $path) { |
1985 | if (my $map = find $k) { |
1975 | $map->load; |
1986 | $map->load if $v; |
1976 | } |
1987 | } |
1977 | |
1988 | |
1978 | delete $MAP_PREFETCH{$path}; |
1989 | delete $MAP_PREFETCH{$k}; |
1979 | } |
1990 | } |
1980 | } |
1991 | } |
1981 | undef $MAP_PREFETCHER; |
1992 | undef $MAP_PREFETCHER; |
1982 | }; |
1993 | }; |
1983 | $MAP_PREFETCHER->prio (6); |
1994 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1986 | } |
1997 | } |
1987 | |
1998 | |
1988 | sub save { |
1999 | sub save { |
1989 | my ($self) = @_; |
2000 | my ($self) = @_; |
1990 | |
2001 | |
1991 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2002 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1992 | |
2003 | |
1993 | $self->{last_save} = $cf::RUNTIME; |
2004 | $self->{last_save} = $cf::RUNTIME; |
1994 | |
2005 | |
1995 | return unless $self->dirty; |
2006 | return unless $self->dirty; |
1996 | |
2007 | |
… | |
… | |
2019 | my ($self) = @_; |
2030 | my ($self) = @_; |
2020 | |
2031 | |
2021 | # save first because save cedes |
2032 | # save first because save cedes |
2022 | $self->save; |
2033 | $self->save; |
2023 | |
2034 | |
2024 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2035 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2025 | |
2036 | |
2026 | return if $self->players; |
2037 | return if $self->players; |
2027 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2038 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2028 | return if $self->{deny_save}; |
2039 | return if $self->{deny_save}; |
2029 | |
2040 | |
… | |
… | |
2081 | my $nuke_counter = "aaaa"; |
2092 | my $nuke_counter = "aaaa"; |
2082 | |
2093 | |
2083 | sub nuke { |
2094 | sub nuke { |
2084 | my ($self) = @_; |
2095 | my ($self) = @_; |
2085 | |
2096 | |
|
|
2097 | { |
|
|
2098 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2099 | |
2086 | delete $cf::MAP{$self->path}; |
2100 | delete $cf::MAP{$self->path}; |
2087 | |
2101 | |
2088 | $self->unlink_save; |
2102 | $self->unlink_save; |
2089 | |
2103 | |
2090 | bless $self, "cf::map"; |
2104 | bless $self, "cf::map"; |
2091 | delete $self->{deny_reset}; |
2105 | delete $self->{deny_reset}; |
2092 | $self->{deny_save} = 1; |
2106 | $self->{deny_save} = 1; |
2093 | $self->reset_timeout (1); |
2107 | $self->reset_timeout (1); |
2094 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2108 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2095 | |
2109 | |
2096 | $cf::MAP{$self->path} = $self; |
2110 | $cf::MAP{$self->path} = $self; |
|
|
2111 | } |
2097 | |
2112 | |
2098 | $self->reset; # polite request, might not happen |
2113 | $self->reset; # polite request, might not happen |
2099 | } |
2114 | } |
2100 | |
2115 | |
2101 | =item $maps = cf::map::tmp_maps |
2116 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2495 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2510 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2496 | the message unless the client supports the msg packet. |
2511 | the message unless the client supports the msg packet. |
2497 | |
2512 | |
2498 | =cut |
2513 | =cut |
2499 | |
2514 | |
|
|
2515 | our %CHANNEL = ( |
|
|
2516 | "c/identify" => { |
|
|
2517 | id => "identify", |
|
|
2518 | title => "Identify", |
|
|
2519 | reply => undef, |
|
|
2520 | tooltip => "Items recently identified", |
|
|
2521 | }, |
|
|
2522 | "c/examine" => { |
|
|
2523 | id => "examine", |
|
|
2524 | title => "Examine", |
|
|
2525 | reply => undef, |
|
|
2526 | tooltip => "Signs and other items you examined", |
|
|
2527 | }, |
|
|
2528 | ); |
|
|
2529 | |
2500 | sub cf::client::send_msg { |
2530 | sub cf::client::send_msg { |
2501 | my ($self, $channel, $msg, $color, @extra) = @_; |
2531 | my ($self, $channel, $msg, $color, @extra) = @_; |
2502 | |
2532 | |
2503 | $msg = $self->pl->expand_cfpod ($msg); |
2533 | $msg = $self->pl->expand_cfpod ($msg); |
2504 | |
2534 | |
2505 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2535 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2536 | |
|
|
2537 | # check predefined channels, for the benefit of C |
|
|
2538 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
2506 | |
2539 | |
2507 | if (ref $channel) { |
2540 | if (ref $channel) { |
2508 | # send meta info to client, if not yet sent |
2541 | # send meta info to client, if not yet sent |
2509 | unless (exists $self->{channel}{$channel->{id}}) { |
2542 | unless (exists $self->{channel}{$channel->{id}}) { |
2510 | $self->{channel}{$channel->{id}} = $channel; |
2543 | $self->{channel}{$channel->{id}} = $channel; |
2511 | $self->ext_msg (channel_info => $channel); |
2544 | $self->ext_msg (channel_info => $channel) |
|
|
2545 | if $self->can_msg; |
2512 | } |
2546 | } |
2513 | |
2547 | |
2514 | $channel = $channel->{id}; |
2548 | $channel = $channel->{id}; |
2515 | } |
2549 | } |
2516 | |
2550 | |
… | |
… | |
2557 | =cut |
2591 | =cut |
2558 | |
2592 | |
2559 | sub cf::client::ext_msg($$@) { |
2593 | sub cf::client::ext_msg($$@) { |
2560 | my ($self, $type, @msg) = @_; |
2594 | my ($self, $type, @msg) = @_; |
2561 | |
2595 | |
2562 | my $extcmd = $self->extcmd; |
|
|
2563 | |
|
|
2564 | if ($extcmd == 2) { |
2596 | if ($self->extcmd == 2) { |
2565 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2597 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2566 | } elsif ($extcmd == 1) { # TODO: remove |
2598 | } elsif ($self->extcmd == 1) { # TODO: remove |
2567 | push @msg, msgtype => "event_$type"; |
2599 | push @msg, msgtype => "event_$type"; |
|
|
2600 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2601 | } |
|
|
2602 | } |
|
|
2603 | |
|
|
2604 | =item $client->ext_reply ($msgid, @msg) |
|
|
2605 | |
|
|
2606 | Sends an ext reply to the client. |
|
|
2607 | |
|
|
2608 | =cut |
|
|
2609 | |
|
|
2610 | sub cf::client::ext_reply($$@) { |
|
|
2611 | my ($self, $id, @msg) = @_; |
|
|
2612 | |
|
|
2613 | if ($self->extcmd == 2) { |
|
|
2614 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2615 | } elsif ($self->extcmd == 1) { |
|
|
2616 | #TODO: version 1, remove |
|
|
2617 | unshift @msg, msgtype => "reply", msgid => $id; |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2618 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | } |
2619 | } |
2570 | } |
2620 | } |
2571 | |
2621 | |
2572 | =item $success = $client->query ($flags, "text", \&cb) |
2622 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2634 | my ($type, $reply, @payload) = |
2684 | my ($type, $reply, @payload) = |
2635 | "ARRAY" eq ref $msg |
2685 | "ARRAY" eq ref $msg |
2636 | ? @$msg |
2686 | ? @$msg |
2637 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2687 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2638 | |
2688 | |
|
|
2689 | my @reply; |
|
|
2690 | |
2639 | if (my $cb = $EXTICMD{$type}) { |
2691 | if (my $cb = $EXTICMD{$type}) { |
2640 | my @reply = $cb->($ns, @payload); |
2692 | @reply = $cb->($ns, @payload); |
2641 | |
|
|
2642 | $ns->ext_reply ($reply, @reply) |
|
|
2643 | if $reply; |
|
|
2644 | } |
2693 | } |
|
|
2694 | |
|
|
2695 | $ns->ext_reply ($reply, @reply) |
|
|
2696 | if $reply; |
|
|
2697 | |
2645 | } else { |
2698 | } else { |
2646 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2699 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2647 | } |
2700 | } |
2648 | |
2701 | |
2649 | cf::override; |
2702 | cf::override; |
… | |
… | |
2710 | |
2763 | |
2711 | The following functions and methods are available within a safe environment: |
2764 | The following functions and methods are available within a safe environment: |
2712 | |
2765 | |
2713 | cf::object |
2766 | cf::object |
2714 | contr pay_amount pay_player map x y force_find force_add |
2767 | contr pay_amount pay_player map x y force_find force_add |
2715 | insert remove name archname title slaying race |
2768 | insert remove name archname title slaying race decrease_ob_nr |
2716 | |
2769 | |
2717 | cf::object::player |
2770 | cf::object::player |
2718 | player |
2771 | player |
2719 | |
2772 | |
2720 | cf::player |
2773 | cf::player |
… | |
… | |
2725 | |
2778 | |
2726 | =cut |
2779 | =cut |
2727 | |
2780 | |
2728 | for ( |
2781 | for ( |
2729 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2782 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2730 | insert remove inv name archname title slaying race)], |
2783 | insert remove inv name archname title slaying race |
|
|
2784 | decrease_ob_nr)], |
2731 | ["cf::object::player" => qw(player)], |
2785 | ["cf::object::player" => qw(player)], |
2732 | ["cf::player" => qw(peaceful)], |
2786 | ["cf::player" => qw(peaceful)], |
2733 | ["cf::map" => qw(trigger)], |
2787 | ["cf::map" => qw(trigger)], |
2734 | ) { |
2788 | ) { |
2735 | no strict 'refs'; |
2789 | no strict 'refs'; |
… | |
… | |
2811 | # the server's init and main functions |
2865 | # the server's init and main functions |
2812 | |
2866 | |
2813 | sub load_facedata($) { |
2867 | sub load_facedata($) { |
2814 | my ($path) = @_; |
2868 | my ($path) = @_; |
2815 | |
2869 | |
|
|
2870 | # HACK to clear player env face cache, we need some signal framework |
|
|
2871 | # for this (global event?) |
|
|
2872 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2873 | |
2816 | my $enc = JSON::XS->new->utf8->canonical; |
2874 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2817 | |
2875 | |
2818 | warn "loading facedata from $path\n"; |
2876 | warn "loading facedata from $path\n"; |
2819 | |
2877 | |
2820 | my $facedata; |
2878 | my $facedata; |
2821 | 0 < aio_load $path, $facedata |
2879 | 0 < aio_load $path, $facedata |
… | |
… | |
2827 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2885 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2828 | |
2886 | |
2829 | # patch in the exptable |
2887 | # patch in the exptable |
2830 | $facedata->{resource}{"res/exp_table"} = { |
2888 | $facedata->{resource}{"res/exp_table"} = { |
2831 | type => FT_RSRC, |
2889 | type => FT_RSRC, |
2832 | data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), |
2890 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
2833 | }; |
2891 | }; |
2834 | cf::cede_to_tick; |
2892 | cf::cede_to_tick; |
2835 | |
2893 | |
2836 | { |
2894 | { |
2837 | my $faces = $facedata->{faceinfo}; |
2895 | my $faces = $facedata->{faceinfo}; |
… | |
… | |
2890 | name => $name, |
2948 | name => $name, |
2891 | %{ $info->{meta} || {} }, |
2949 | %{ $info->{meta} || {} }, |
2892 | }); |
2950 | }); |
2893 | |
2951 | |
2894 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2952 | $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
2953 | } else { |
|
|
2954 | $data = $info->{data}; |
2895 | } |
2955 | } |
2896 | |
2956 | |
2897 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2957 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2898 | cf::face::set_type $idx, $info->{type}; |
2958 | cf::face::set_type $idx, $info->{type}; |
2899 | |
2959 | |
… | |
… | |
2929 | $ns->fx_want ($k, $v); |
2989 | $ns->fx_want ($k, $v); |
2930 | } |
2990 | } |
2931 | }; |
2991 | }; |
2932 | |
2992 | |
2933 | sub reload_regions { |
2993 | sub reload_regions { |
|
|
2994 | # HACK to clear player env face cache, we need some signal framework |
|
|
2995 | # for this (global event?) |
|
|
2996 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2997 | |
2934 | load_resource_file "$MAPDIR/regions" |
2998 | load_resource_file "$MAPDIR/regions" |
2935 | or die "unable to load regions file\n"; |
2999 | or die "unable to load regions file\n"; |
2936 | |
3000 | |
2937 | for (cf::region::list) { |
3001 | for (cf::region::list) { |
2938 | $_->{match} = qr/$_->{match}/ |
3002 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2974 | |
3038 | |
2975 | sub init { |
3039 | sub init { |
2976 | reload_resources; |
3040 | reload_resources; |
2977 | } |
3041 | } |
2978 | |
3042 | |
2979 | sub cfg_load { |
3043 | sub reload_config { |
2980 | open my $fh, "<:utf8", "$CONFDIR/config" |
3044 | open my $fh, "<:utf8", "$CONFDIR/config" |
2981 | or return; |
3045 | or return; |
2982 | |
3046 | |
2983 | local $/; |
3047 | local $/; |
2984 | *CFG = YAML::Syck::Load <$fh>; |
3048 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3004 | (async { |
3068 | (async { |
3005 | Event::one_event; |
3069 | Event::one_event; |
3006 | })->prio (Coro::PRIO_MAX); |
3070 | })->prio (Coro::PRIO_MAX); |
3007 | }; |
3071 | }; |
3008 | |
3072 | |
3009 | cfg_load; |
3073 | reload_config; |
3010 | db_init; |
3074 | db_init; |
3011 | load_extensions; |
3075 | load_extensions; |
3012 | |
3076 | |
3013 | $TICK_WATCHER->start; |
3077 | $TICK_WATCHER->start; |
3014 | Event::loop; |
3078 | Event::loop; |
… | |
… | |
3207 | warn "reloading cf.pm"; |
3271 | warn "reloading cf.pm"; |
3208 | require cf; |
3272 | require cf; |
3209 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3273 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3210 | |
3274 | |
3211 | warn "loading config and database again"; |
3275 | warn "loading config and database again"; |
3212 | cf::cfg_load; |
3276 | cf::reload_config; |
3213 | |
3277 | |
3214 | warn "loading extensions"; |
3278 | warn "loading extensions"; |
3215 | cf::load_extensions; |
3279 | cf::load_extensions; |
3216 | |
3280 | |
3217 | warn "reattaching attachments to objects/players"; |
3281 | warn "reattaching attachments to objects/players"; |