… | |
… | |
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 | |
… | |
… | |
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 | |
… | |
… | |
1457 | sub expand_cfpod { |
1463 | sub expand_cfpod { |
1458 | ((my $self), (local $_)) = @_; |
1464 | ((my $self), (local $_)) = @_; |
1459 | |
1465 | |
1460 | # escape & and < |
1466 | # escape & and < |
1461 | s/&/&/g; |
1467 | s/&/&/g; |
1462 | s/(?<![BIUGH])</</g; |
1468 | s/(?<![BIUGHT])</</g; |
1463 | |
1469 | |
1464 | # this is buggy, it needs to properly take care of nested <'s |
1470 | # this is buggy, it needs to properly take care of nested <'s |
1465 | |
1471 | |
1466 | 1 while |
1472 | 1 while |
1467 | # replace B<>, I<>, U<> etc. |
1473 | # replace B<>, I<>, U<> etc. |
1468 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1474 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1469 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1475 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1470 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1476 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1477 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1471 | # replace G<male|female> tags |
1478 | # replace G<male|female> tags |
1472 | || s{G<([^>|]*)\|([^>]*)>}{ |
1479 | || s{G<([^>|]*)\|([^>]*)>}{ |
1473 | $self->gender ? $2 : $1 |
1480 | $self->gender ? $2 : $1 |
1474 | }ge |
1481 | }ge |
1475 | # replace H<hint text> |
1482 | # replace H<hint text> |
… | |
… | |
1846 | local $self->{deny_reset} = 1; # loading can take a long time |
1853 | local $self->{deny_reset} = 1; # loading can take a long time |
1847 | |
1854 | |
1848 | my $path = $self->{path}; |
1855 | my $path = $self->{path}; |
1849 | |
1856 | |
1850 | { |
1857 | { |
|
|
1858 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1851 | my $guard = cf::lock_acquire "map_load:$path"; |
1859 | my $guard2 = cf::lock_acquire "map_load:$path"; |
1852 | |
1860 | |
1853 | return if $self->in_memory != cf::MAP_SWAPPED; |
1861 | return if $self->in_memory != cf::MAP_SWAPPED; |
1854 | |
1862 | |
1855 | $self->in_memory (cf::MAP_LOADING); |
1863 | $self->in_memory (cf::MAP_LOADING); |
1856 | |
1864 | |
1857 | $self->alloc; |
1865 | $self->alloc; |
1858 | |
1866 | |
1859 | $self->pre_load; |
1867 | $self->pre_load; |
1860 | Coro::cede; |
1868 | cf::cede_to_tick; |
1861 | |
1869 | |
1862 | $self->_load_objects ($self->{load_path}, 1) |
1870 | $self->_load_objects ($self->{load_path}, 1) |
1863 | or return; |
1871 | or return; |
1864 | |
1872 | |
1865 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1873 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
… | |
… | |
1871 | $self->clear_unique_items; |
1879 | $self->clear_unique_items; |
1872 | $self->_load_objects ($uniq, 0); |
1880 | $self->_load_objects ($uniq, 0); |
1873 | } |
1881 | } |
1874 | } |
1882 | } |
1875 | |
1883 | |
1876 | Coro::cede; |
1884 | cf::cede_to_tick; |
1877 | # now do the right thing for maps |
1885 | # now do the right thing for maps |
1878 | $self->link_multipart_objects; |
1886 | $self->link_multipart_objects; |
1879 | $self->difficulty ($self->estimate_difficulty) |
1887 | $self->difficulty ($self->estimate_difficulty) |
1880 | unless $self->difficulty; |
1888 | unless $self->difficulty; |
1881 | Coro::cede; |
1889 | cf::cede_to_tick; |
1882 | |
1890 | |
1883 | unless ($self->{deny_activate}) { |
1891 | unless ($self->{deny_activate}) { |
1884 | $self->decay_objects; |
1892 | $self->decay_objects; |
1885 | $self->fix_auto_apply; |
1893 | $self->fix_auto_apply; |
1886 | $self->update_buttons; |
1894 | $self->update_buttons; |
1887 | Coro::cede; |
1895 | cf::cede_to_tick; |
1888 | $self->set_darkness_map; |
1896 | $self->set_darkness_map; |
1889 | Coro::cede; |
1897 | cf::cede_to_tick; |
1890 | $self->activate; |
1898 | $self->activate; |
1891 | } |
1899 | } |
1892 | |
1900 | |
1893 | $self->{last_save} = $cf::RUNTIME; |
1901 | $self->{last_save} = $cf::RUNTIME; |
1894 | $self->last_access ($cf::RUNTIME); |
1902 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1944 | } |
1952 | } |
1945 | |
1953 | |
1946 | sub do_load_sync { |
1954 | sub do_load_sync { |
1947 | my ($map) = @_; |
1955 | my ($map) = @_; |
1948 | |
1956 | |
|
|
1957 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1958 | if $Coro::current == $Coro::main; |
|
|
1959 | |
1949 | cf::sync_job { $map->load }; |
1960 | cf::sync_job { $map->load }; |
1950 | } |
1961 | } |
1951 | |
1962 | |
1952 | our %MAP_PREFETCH; |
1963 | our %MAP_PREFETCH; |
1953 | our $MAP_PREFETCHER = undef; |
1964 | our $MAP_PREFETCHER = undef; |
1954 | |
1965 | |
1955 | sub find_async { |
1966 | sub find_async { |
1956 | my ($path, $origin) = @_; |
1967 | my ($path, $origin, $load) = @_; |
1957 | |
1968 | |
1958 | $path = normalise $path, $origin && $origin->{path}; |
1969 | $path = normalise $path, $origin && $origin->{path}; |
1959 | |
1970 | |
1960 | if (my $map = $cf::MAP{$path}) { |
1971 | if (my $map = $cf::MAP{$path}) { |
1961 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1972 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1962 | } |
1973 | } |
1963 | |
1974 | |
1964 | undef $MAP_PREFETCH{$path}; |
1975 | $MAP_PREFETCH{$path} |= $load; |
|
|
1976 | |
1965 | $MAP_PREFETCHER ||= cf::async { |
1977 | $MAP_PREFETCHER ||= cf::async { |
1966 | while (%MAP_PREFETCH) { |
1978 | while (%MAP_PREFETCH) { |
1967 | for my $path (keys %MAP_PREFETCH) { |
1979 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1968 | if (my $map = find $path) { |
1980 | if (my $map = find $k) { |
1969 | $map->load; |
1981 | $map->load if $v; |
1970 | } |
1982 | } |
1971 | |
1983 | |
1972 | delete $MAP_PREFETCH{$path}; |
1984 | delete $MAP_PREFETCH{$k}; |
1973 | } |
1985 | } |
1974 | } |
1986 | } |
1975 | undef $MAP_PREFETCHER; |
1987 | undef $MAP_PREFETCHER; |
1976 | }; |
1988 | }; |
1977 | $MAP_PREFETCHER->prio (6); |
1989 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1980 | } |
1992 | } |
1981 | |
1993 | |
1982 | sub save { |
1994 | sub save { |
1983 | my ($self) = @_; |
1995 | my ($self) = @_; |
1984 | |
1996 | |
1985 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
1997 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1986 | |
1998 | |
1987 | $self->{last_save} = $cf::RUNTIME; |
1999 | $self->{last_save} = $cf::RUNTIME; |
1988 | |
2000 | |
1989 | return unless $self->dirty; |
2001 | return unless $self->dirty; |
1990 | |
2002 | |
… | |
… | |
2013 | my ($self) = @_; |
2025 | my ($self) = @_; |
2014 | |
2026 | |
2015 | # save first because save cedes |
2027 | # save first because save cedes |
2016 | $self->save; |
2028 | $self->save; |
2017 | |
2029 | |
2018 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2030 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2019 | |
2031 | |
2020 | return if $self->players; |
2032 | return if $self->players; |
2021 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2033 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2022 | return if $self->{deny_save}; |
2034 | return if $self->{deny_save}; |
2023 | |
2035 | |
… | |
… | |
2075 | my $nuke_counter = "aaaa"; |
2087 | my $nuke_counter = "aaaa"; |
2076 | |
2088 | |
2077 | sub nuke { |
2089 | sub nuke { |
2078 | my ($self) = @_; |
2090 | my ($self) = @_; |
2079 | |
2091 | |
|
|
2092 | { |
|
|
2093 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2094 | |
2080 | delete $cf::MAP{$self->path}; |
2095 | delete $cf::MAP{$self->path}; |
2081 | |
2096 | |
2082 | $self->unlink_save; |
2097 | $self->unlink_save; |
2083 | |
2098 | |
2084 | bless $self, "cf::map"; |
2099 | bless $self, "cf::map"; |
2085 | delete $self->{deny_reset}; |
2100 | delete $self->{deny_reset}; |
2086 | $self->{deny_save} = 1; |
2101 | $self->{deny_save} = 1; |
2087 | $self->reset_timeout (1); |
2102 | $self->reset_timeout (1); |
2088 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2103 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2089 | |
2104 | |
2090 | $cf::MAP{$self->path} = $self; |
2105 | $cf::MAP{$self->path} = $self; |
|
|
2106 | } |
2091 | |
2107 | |
2092 | $self->reset; # polite request, might not happen |
2108 | $self->reset; # polite request, might not happen |
2093 | } |
2109 | } |
2094 | |
2110 | |
2095 | =item $maps = cf::map::tmp_maps |
2111 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2489 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2505 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2490 | the message unless the client supports the msg packet. |
2506 | the message unless the client supports the msg packet. |
2491 | |
2507 | |
2492 | =cut |
2508 | =cut |
2493 | |
2509 | |
|
|
2510 | our %CHANNEL = ( |
|
|
2511 | "c/identify" => { |
|
|
2512 | id => "identify", |
|
|
2513 | title => "Identify", |
|
|
2514 | reply => undef, |
|
|
2515 | tooltip => "Items recently identified", |
|
|
2516 | }, |
|
|
2517 | "c/examine" => { |
|
|
2518 | id => "examine", |
|
|
2519 | title => "Examine", |
|
|
2520 | reply => undef, |
|
|
2521 | tooltip => "Signs and other items you examined", |
|
|
2522 | }, |
|
|
2523 | ); |
|
|
2524 | |
2494 | sub cf::client::send_msg { |
2525 | sub cf::client::send_msg { |
2495 | my ($self, $channel, $msg, $color, @extra) = @_; |
2526 | my ($self, $channel, $msg, $color, @extra) = @_; |
2496 | |
2527 | |
2497 | $msg = $self->pl->expand_cfpod ($msg); |
2528 | $msg = $self->pl->expand_cfpod ($msg); |
2498 | |
2529 | |
2499 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2530 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2531 | |
|
|
2532 | # check predefined channels, for the benefit of C |
|
|
2533 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
2500 | |
2534 | |
2501 | if (ref $channel) { |
2535 | if (ref $channel) { |
2502 | # send meta info to client, if not yet sent |
2536 | # send meta info to client, if not yet sent |
2503 | unless (exists $self->{channel}{$channel->{id}}) { |
2537 | unless (exists $self->{channel}{$channel->{id}}) { |
2504 | $self->{channel}{$channel->{id}} = $channel; |
2538 | $self->{channel}{$channel->{id}} = $channel; |
… | |
… | |
2551 | =cut |
2585 | =cut |
2552 | |
2586 | |
2553 | sub cf::client::ext_msg($$@) { |
2587 | sub cf::client::ext_msg($$@) { |
2554 | my ($self, $type, @msg) = @_; |
2588 | my ($self, $type, @msg) = @_; |
2555 | |
2589 | |
2556 | my $extcmd = $self->extcmd; |
|
|
2557 | |
|
|
2558 | if ($extcmd == 2) { |
2590 | if ($self->extcmd == 2) { |
2559 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2591 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2560 | } elsif ($extcmd == 1) { # TODO: remove |
2592 | } elsif ($self->extcmd == 1) { # TODO: remove |
2561 | push @msg, msgtype => "event_$type"; |
2593 | push @msg, msgtype => "event_$type"; |
2562 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2594 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2563 | } |
2595 | } |
2564 | } |
2596 | } |
2565 | |
2597 | |
… | |
… | |
2572 | sub cf::client::ext_reply($$@) { |
2604 | sub cf::client::ext_reply($$@) { |
2573 | my ($self, $id, @msg) = @_; |
2605 | my ($self, $id, @msg) = @_; |
2574 | |
2606 | |
2575 | if ($self->extcmd == 2) { |
2607 | if ($self->extcmd == 2) { |
2576 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2608 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2577 | } elsif ($self->ns->extcmd == 1) { |
2609 | } elsif ($self->extcmd == 1) { |
2578 | #TODO: version 1, remove |
2610 | #TODO: version 1, remove |
2579 | unshift @msg, msgtype => "reply", msgid => $id; |
2611 | unshift @msg, msgtype => "reply", msgid => $id; |
2580 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2612 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2581 | } |
2613 | } |
2582 | } |
2614 | } |
… | |
… | |
2646 | my ($type, $reply, @payload) = |
2678 | my ($type, $reply, @payload) = |
2647 | "ARRAY" eq ref $msg |
2679 | "ARRAY" eq ref $msg |
2648 | ? @$msg |
2680 | ? @$msg |
2649 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2681 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2650 | |
2682 | |
|
|
2683 | my @reply; |
|
|
2684 | |
2651 | if (my $cb = $EXTICMD{$type}) { |
2685 | if (my $cb = $EXTICMD{$type}) { |
2652 | my @reply = $cb->($ns, @payload); |
2686 | @reply = $cb->($ns, @payload); |
2653 | |
|
|
2654 | $ns->ext_reply ($reply, @reply) |
|
|
2655 | if $reply; |
|
|
2656 | } |
2687 | } |
|
|
2688 | |
|
|
2689 | $ns->ext_reply ($reply, @reply) |
|
|
2690 | if $reply; |
|
|
2691 | |
2657 | } else { |
2692 | } else { |
2658 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2693 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2659 | } |
2694 | } |
2660 | |
2695 | |
2661 | cf::override; |
2696 | cf::override; |
… | |
… | |
2722 | |
2757 | |
2723 | The following functions and methods are available within a safe environment: |
2758 | The following functions and methods are available within a safe environment: |
2724 | |
2759 | |
2725 | cf::object |
2760 | cf::object |
2726 | contr pay_amount pay_player map x y force_find force_add |
2761 | contr pay_amount pay_player map x y force_find force_add |
2727 | insert remove name archname title slaying race |
2762 | insert remove name archname title slaying race decrease_ob_nr |
2728 | |
2763 | |
2729 | cf::object::player |
2764 | cf::object::player |
2730 | player |
2765 | player |
2731 | |
2766 | |
2732 | cf::player |
2767 | cf::player |
… | |
… | |
2737 | |
2772 | |
2738 | =cut |
2773 | =cut |
2739 | |
2774 | |
2740 | for ( |
2775 | for ( |
2741 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2776 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2742 | insert remove inv name archname title slaying race)], |
2777 | insert remove inv name archname title slaying race |
|
|
2778 | decrease_ob_nr)], |
2743 | ["cf::object::player" => qw(player)], |
2779 | ["cf::object::player" => qw(player)], |
2744 | ["cf::player" => qw(peaceful)], |
2780 | ["cf::player" => qw(peaceful)], |
2745 | ["cf::map" => qw(trigger)], |
2781 | ["cf::map" => qw(trigger)], |
2746 | ) { |
2782 | ) { |
2747 | no strict 'refs'; |
2783 | no strict 'refs'; |
… | |
… | |
2823 | # the server's init and main functions |
2859 | # the server's init and main functions |
2824 | |
2860 | |
2825 | sub load_facedata($) { |
2861 | sub load_facedata($) { |
2826 | my ($path) = @_; |
2862 | my ($path) = @_; |
2827 | |
2863 | |
|
|
2864 | # HACK to clear player env face cache, we need some signal framework |
|
|
2865 | # for this (global event?) |
|
|
2866 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2867 | |
2828 | my $enc = JSON::XS->new->utf8->canonical; |
2868 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2829 | |
2869 | |
2830 | warn "loading facedata from $path\n"; |
2870 | warn "loading facedata from $path\n"; |
2831 | |
2871 | |
2832 | my $facedata; |
2872 | my $facedata; |
2833 | 0 < aio_load $path, $facedata |
2873 | 0 < aio_load $path, $facedata |
… | |
… | |
2943 | $ns->fx_want ($k, $v); |
2983 | $ns->fx_want ($k, $v); |
2944 | } |
2984 | } |
2945 | }; |
2985 | }; |
2946 | |
2986 | |
2947 | sub reload_regions { |
2987 | sub reload_regions { |
|
|
2988 | # HACK to clear player env face cache, we need some signal framework |
|
|
2989 | # for this (global event?) |
|
|
2990 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2991 | |
2948 | load_resource_file "$MAPDIR/regions" |
2992 | load_resource_file "$MAPDIR/regions" |
2949 | or die "unable to load regions file\n"; |
2993 | or die "unable to load regions file\n"; |
2950 | |
2994 | |
2951 | for (cf::region::list) { |
2995 | for (cf::region::list) { |
2952 | $_->{match} = qr/$_->{match}/ |
2996 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2988 | |
3032 | |
2989 | sub init { |
3033 | sub init { |
2990 | reload_resources; |
3034 | reload_resources; |
2991 | } |
3035 | } |
2992 | |
3036 | |
2993 | sub cfg_load { |
3037 | sub reload_config { |
2994 | open my $fh, "<:utf8", "$CONFDIR/config" |
3038 | open my $fh, "<:utf8", "$CONFDIR/config" |
2995 | or return; |
3039 | or return; |
2996 | |
3040 | |
2997 | local $/; |
3041 | local $/; |
2998 | *CFG = YAML::Syck::Load <$fh>; |
3042 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3018 | (async { |
3062 | (async { |
3019 | Event::one_event; |
3063 | Event::one_event; |
3020 | })->prio (Coro::PRIO_MAX); |
3064 | })->prio (Coro::PRIO_MAX); |
3021 | }; |
3065 | }; |
3022 | |
3066 | |
3023 | cfg_load; |
3067 | reload_config; |
3024 | db_init; |
3068 | db_init; |
3025 | load_extensions; |
3069 | load_extensions; |
3026 | |
3070 | |
3027 | $TICK_WATCHER->start; |
3071 | $TICK_WATCHER->start; |
3028 | Event::loop; |
3072 | Event::loop; |
… | |
… | |
3221 | warn "reloading cf.pm"; |
3265 | warn "reloading cf.pm"; |
3222 | require cf; |
3266 | require cf; |
3223 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3267 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3224 | |
3268 | |
3225 | warn "loading config and database again"; |
3269 | warn "loading config and database again"; |
3226 | cf::cfg_load; |
3270 | cf::reload_config; |
3227 | |
3271 | |
3228 | warn "loading extensions"; |
3272 | warn "loading extensions"; |
3229 | cf::load_extensions; |
3273 | cf::load_extensions; |
3230 | |
3274 | |
3231 | warn "reattaching attachments to objects/players"; |
3275 | warn "reattaching attachments to objects/players"; |