… | |
… | |
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 | |
… | |
… | |
1505 | =cut |
1511 | =cut |
1506 | |
1512 | |
1507 | sub ext_reply($$@) { |
1513 | sub ext_reply($$@) { |
1508 | my ($self, $id, @msg) = @_; |
1514 | my ($self, $id, @msg) = @_; |
1509 | |
1515 | |
1510 | if ($self->ns->extcmd == 2) { |
1516 | $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 | } |
1517 | } |
1518 | |
1518 | |
1519 | =item $player->ext_msg ($type, @msg) |
1519 | =item $player->ext_msg ($type, @msg) |
1520 | |
1520 | |
1521 | Sends an ext event to the client. |
1521 | Sends an ext event to the client. |
… | |
… | |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1853 | |
1853 | |
1854 | my $path = $self->{path}; |
1854 | my $path = $self->{path}; |
1855 | |
1855 | |
1856 | { |
1856 | { |
|
|
1857 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1857 | my $guard = cf::lock_acquire "map_load:$path"; |
1858 | my $guard2 = cf::lock_acquire "map_load:$path"; |
1858 | |
1859 | |
1859 | return if $self->in_memory != cf::MAP_SWAPPED; |
1860 | return if $self->in_memory != cf::MAP_SWAPPED; |
1860 | |
1861 | |
1861 | $self->in_memory (cf::MAP_LOADING); |
1862 | $self->in_memory (cf::MAP_LOADING); |
1862 | |
1863 | |
1863 | $self->alloc; |
1864 | $self->alloc; |
1864 | |
1865 | |
1865 | $self->pre_load; |
1866 | $self->pre_load; |
1866 | Coro::cede; |
1867 | cf::cede_to_tick; |
1867 | |
1868 | |
1868 | $self->_load_objects ($self->{load_path}, 1) |
1869 | $self->_load_objects ($self->{load_path}, 1) |
1869 | or return; |
1870 | or return; |
1870 | |
1871 | |
1871 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1872 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
… | |
… | |
1877 | $self->clear_unique_items; |
1878 | $self->clear_unique_items; |
1878 | $self->_load_objects ($uniq, 0); |
1879 | $self->_load_objects ($uniq, 0); |
1879 | } |
1880 | } |
1880 | } |
1881 | } |
1881 | |
1882 | |
1882 | Coro::cede; |
1883 | cf::cede_to_tick; |
1883 | # now do the right thing for maps |
1884 | # now do the right thing for maps |
1884 | $self->link_multipart_objects; |
1885 | $self->link_multipart_objects; |
1885 | $self->difficulty ($self->estimate_difficulty) |
1886 | $self->difficulty ($self->estimate_difficulty) |
1886 | unless $self->difficulty; |
1887 | unless $self->difficulty; |
1887 | Coro::cede; |
1888 | cf::cede_to_tick; |
1888 | |
1889 | |
1889 | unless ($self->{deny_activate}) { |
1890 | unless ($self->{deny_activate}) { |
1890 | $self->decay_objects; |
1891 | $self->decay_objects; |
1891 | $self->fix_auto_apply; |
1892 | $self->fix_auto_apply; |
1892 | $self->update_buttons; |
1893 | $self->update_buttons; |
1893 | Coro::cede; |
1894 | cf::cede_to_tick; |
1894 | $self->set_darkness_map; |
1895 | $self->set_darkness_map; |
1895 | Coro::cede; |
1896 | cf::cede_to_tick; |
1896 | $self->activate; |
1897 | $self->activate; |
1897 | } |
1898 | } |
1898 | |
1899 | |
1899 | $self->{last_save} = $cf::RUNTIME; |
1900 | $self->{last_save} = $cf::RUNTIME; |
1900 | $self->last_access ($cf::RUNTIME); |
1901 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1950 | } |
1951 | } |
1951 | |
1952 | |
1952 | sub do_load_sync { |
1953 | sub do_load_sync { |
1953 | my ($map) = @_; |
1954 | my ($map) = @_; |
1954 | |
1955 | |
|
|
1956 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1957 | if $Coro::current == $Coro::main; |
|
|
1958 | |
1955 | cf::sync_job { $map->load }; |
1959 | cf::sync_job { $map->load }; |
1956 | } |
1960 | } |
1957 | |
1961 | |
1958 | our %MAP_PREFETCH; |
1962 | our %MAP_PREFETCH; |
1959 | our $MAP_PREFETCHER = undef; |
1963 | our $MAP_PREFETCHER = undef; |
1960 | |
1964 | |
1961 | sub find_async { |
1965 | sub find_async { |
1962 | my ($path, $origin) = @_; |
1966 | my ($path, $origin, $load) = @_; |
1963 | |
1967 | |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1968 | $path = normalise $path, $origin && $origin->{path}; |
1965 | |
1969 | |
1966 | if (my $map = $cf::MAP{$path}) { |
1970 | if (my $map = $cf::MAP{$path}) { |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1971 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1968 | } |
1972 | } |
1969 | |
1973 | |
1970 | undef $MAP_PREFETCH{$path}; |
1974 | $MAP_PREFETCH{$path} |= $load; |
|
|
1975 | |
1971 | $MAP_PREFETCHER ||= cf::async { |
1976 | $MAP_PREFETCHER ||= cf::async { |
1972 | while (%MAP_PREFETCH) { |
1977 | while (%MAP_PREFETCH) { |
1973 | for my $path (keys %MAP_PREFETCH) { |
1978 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1974 | if (my $map = find $path) { |
1979 | if (my $map = find $k) { |
1975 | $map->load; |
1980 | $map->load if $v; |
1976 | } |
1981 | } |
1977 | |
1982 | |
1978 | delete $MAP_PREFETCH{$path}; |
1983 | delete $MAP_PREFETCH{$k}; |
1979 | } |
1984 | } |
1980 | } |
1985 | } |
1981 | undef $MAP_PREFETCHER; |
1986 | undef $MAP_PREFETCHER; |
1982 | }; |
1987 | }; |
1983 | $MAP_PREFETCHER->prio (6); |
1988 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1986 | } |
1991 | } |
1987 | |
1992 | |
1988 | sub save { |
1993 | sub save { |
1989 | my ($self) = @_; |
1994 | my ($self) = @_; |
1990 | |
1995 | |
1991 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
1996 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1992 | |
1997 | |
1993 | $self->{last_save} = $cf::RUNTIME; |
1998 | $self->{last_save} = $cf::RUNTIME; |
1994 | |
1999 | |
1995 | return unless $self->dirty; |
2000 | return unless $self->dirty; |
1996 | |
2001 | |
… | |
… | |
2019 | my ($self) = @_; |
2024 | my ($self) = @_; |
2020 | |
2025 | |
2021 | # save first because save cedes |
2026 | # save first because save cedes |
2022 | $self->save; |
2027 | $self->save; |
2023 | |
2028 | |
2024 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2029 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2025 | |
2030 | |
2026 | return if $self->players; |
2031 | return if $self->players; |
2027 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2032 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2028 | return if $self->{deny_save}; |
2033 | return if $self->{deny_save}; |
2029 | |
2034 | |
… | |
… | |
2081 | my $nuke_counter = "aaaa"; |
2086 | my $nuke_counter = "aaaa"; |
2082 | |
2087 | |
2083 | sub nuke { |
2088 | sub nuke { |
2084 | my ($self) = @_; |
2089 | my ($self) = @_; |
2085 | |
2090 | |
|
|
2091 | { |
|
|
2092 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2093 | |
2086 | delete $cf::MAP{$self->path}; |
2094 | delete $cf::MAP{$self->path}; |
2087 | |
2095 | |
2088 | $self->unlink_save; |
2096 | $self->unlink_save; |
2089 | |
2097 | |
2090 | bless $self, "cf::map"; |
2098 | bless $self, "cf::map"; |
2091 | delete $self->{deny_reset}; |
2099 | delete $self->{deny_reset}; |
2092 | $self->{deny_save} = 1; |
2100 | $self->{deny_save} = 1; |
2093 | $self->reset_timeout (1); |
2101 | $self->reset_timeout (1); |
2094 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2102 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2095 | |
2103 | |
2096 | $cf::MAP{$self->path} = $self; |
2104 | $cf::MAP{$self->path} = $self; |
|
|
2105 | } |
2097 | |
2106 | |
2098 | $self->reset; # polite request, might not happen |
2107 | $self->reset; # polite request, might not happen |
2099 | } |
2108 | } |
2100 | |
2109 | |
2101 | =item $maps = cf::map::tmp_maps |
2110 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2495 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2504 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2496 | the message unless the client supports the msg packet. |
2505 | the message unless the client supports the msg packet. |
2497 | |
2506 | |
2498 | =cut |
2507 | =cut |
2499 | |
2508 | |
|
|
2509 | our %CHANNEL = ( |
|
|
2510 | "c/identify" => { |
|
|
2511 | id => "identify", |
|
|
2512 | title => "Identify", |
|
|
2513 | reply => undef, |
|
|
2514 | tooltip => "Items recently identified", |
|
|
2515 | }, |
|
|
2516 | ); |
|
|
2517 | |
2500 | sub cf::client::send_msg { |
2518 | sub cf::client::send_msg { |
2501 | my ($self, $channel, $msg, $color, @extra) = @_; |
2519 | my ($self, $channel, $msg, $color, @extra) = @_; |
2502 | |
2520 | |
2503 | $msg = $self->pl->expand_cfpod ($msg); |
2521 | $msg = $self->pl->expand_cfpod ($msg); |
2504 | |
2522 | |
2505 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2523 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2524 | |
|
|
2525 | # check predefined channels, for the benefit of C |
|
|
2526 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
2506 | |
2527 | |
2507 | if (ref $channel) { |
2528 | if (ref $channel) { |
2508 | # send meta info to client, if not yet sent |
2529 | # send meta info to client, if not yet sent |
2509 | unless (exists $self->{channel}{$channel->{id}}) { |
2530 | unless (exists $self->{channel}{$channel->{id}}) { |
2510 | $self->{channel}{$channel->{id}} = $channel; |
2531 | $self->{channel}{$channel->{id}} = $channel; |
… | |
… | |
2557 | =cut |
2578 | =cut |
2558 | |
2579 | |
2559 | sub cf::client::ext_msg($$@) { |
2580 | sub cf::client::ext_msg($$@) { |
2560 | my ($self, $type, @msg) = @_; |
2581 | my ($self, $type, @msg) = @_; |
2561 | |
2582 | |
2562 | my $extcmd = $self->extcmd; |
|
|
2563 | |
|
|
2564 | if ($extcmd == 2) { |
2583 | if ($self->extcmd == 2) { |
2565 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2584 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2566 | } elsif ($extcmd == 1) { # TODO: remove |
2585 | } elsif ($self->extcmd == 1) { # TODO: remove |
2567 | push @msg, msgtype => "event_$type"; |
2586 | push @msg, msgtype => "event_$type"; |
|
|
2587 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2588 | } |
|
|
2589 | } |
|
|
2590 | |
|
|
2591 | =item $client->ext_reply ($msgid, @msg) |
|
|
2592 | |
|
|
2593 | Sends an ext reply to the client. |
|
|
2594 | |
|
|
2595 | =cut |
|
|
2596 | |
|
|
2597 | sub cf::client::ext_reply($$@) { |
|
|
2598 | my ($self, $id, @msg) = @_; |
|
|
2599 | |
|
|
2600 | if ($self->extcmd == 2) { |
|
|
2601 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2602 | } elsif ($self->extcmd == 1) { |
|
|
2603 | #TODO: version 1, remove |
|
|
2604 | unshift @msg, msgtype => "reply", msgid => $id; |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2605 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | } |
2606 | } |
2570 | } |
2607 | } |
2571 | |
2608 | |
2572 | =item $success = $client->query ($flags, "text", \&cb) |
2609 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2634 | my ($type, $reply, @payload) = |
2671 | my ($type, $reply, @payload) = |
2635 | "ARRAY" eq ref $msg |
2672 | "ARRAY" eq ref $msg |
2636 | ? @$msg |
2673 | ? @$msg |
2637 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2674 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2638 | |
2675 | |
|
|
2676 | my @reply; |
|
|
2677 | |
2639 | if (my $cb = $EXTICMD{$type}) { |
2678 | if (my $cb = $EXTICMD{$type}) { |
2640 | my @reply = $cb->($ns, @payload); |
2679 | @reply = $cb->($ns, @payload); |
2641 | |
|
|
2642 | $ns->ext_reply ($reply, @reply) |
|
|
2643 | if $reply; |
|
|
2644 | } |
2680 | } |
|
|
2681 | |
|
|
2682 | $ns->ext_reply ($reply, @reply) |
|
|
2683 | if $reply; |
|
|
2684 | |
2645 | } else { |
2685 | } else { |
2646 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2686 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2647 | } |
2687 | } |
2648 | |
2688 | |
2649 | cf::override; |
2689 | cf::override; |
… | |
… | |
2710 | |
2750 | |
2711 | The following functions and methods are available within a safe environment: |
2751 | The following functions and methods are available within a safe environment: |
2712 | |
2752 | |
2713 | cf::object |
2753 | cf::object |
2714 | contr pay_amount pay_player map x y force_find force_add |
2754 | contr pay_amount pay_player map x y force_find force_add |
2715 | insert remove name archname title slaying race |
2755 | insert remove name archname title slaying race decrease_ob_nr |
2716 | |
2756 | |
2717 | cf::object::player |
2757 | cf::object::player |
2718 | player |
2758 | player |
2719 | |
2759 | |
2720 | cf::player |
2760 | cf::player |
… | |
… | |
2725 | |
2765 | |
2726 | =cut |
2766 | =cut |
2727 | |
2767 | |
2728 | for ( |
2768 | for ( |
2729 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2769 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2730 | insert remove inv name archname title slaying race)], |
2770 | insert remove inv name archname title slaying race |
|
|
2771 | decrease_ob_nr)], |
2731 | ["cf::object::player" => qw(player)], |
2772 | ["cf::object::player" => qw(player)], |
2732 | ["cf::player" => qw(peaceful)], |
2773 | ["cf::player" => qw(peaceful)], |
2733 | ["cf::map" => qw(trigger)], |
2774 | ["cf::map" => qw(trigger)], |
2734 | ) { |
2775 | ) { |
2735 | no strict 'refs'; |
2776 | no strict 'refs'; |
… | |
… | |
2811 | # the server's init and main functions |
2852 | # the server's init and main functions |
2812 | |
2853 | |
2813 | sub load_facedata($) { |
2854 | sub load_facedata($) { |
2814 | my ($path) = @_; |
2855 | my ($path) = @_; |
2815 | |
2856 | |
|
|
2857 | # HACK to clear player env face cache, we need some signal framework |
|
|
2858 | # for this (global event?) |
|
|
2859 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2860 | |
|
|
2861 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
2862 | |
2816 | warn "loading facedata from $path\n"; |
2863 | warn "loading facedata from $path\n"; |
2817 | |
2864 | |
2818 | my $facedata; |
2865 | my $facedata; |
2819 | 0 < aio_load $path, $facedata |
2866 | 0 < aio_load $path, $facedata |
2820 | or die "$path: $!"; |
2867 | or die "$path: $!"; |
2821 | |
2868 | |
2822 | $facedata = Coro::Storable::thaw $facedata; |
2869 | $facedata = Coro::Storable::thaw $facedata; |
2823 | |
2870 | |
2824 | $facedata->{version} == 2 |
2871 | $facedata->{version} == 2 |
2825 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2872 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
|
|
2873 | |
|
|
2874 | # patch in the exptable |
|
|
2875 | $facedata->{resource}{"res/exp_table"} = { |
|
|
2876 | type => FT_RSRC, |
|
|
2877 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
2878 | }; |
|
|
2879 | cf::cede_to_tick; |
2826 | |
2880 | |
2827 | { |
2881 | { |
2828 | my $faces = $facedata->{faceinfo}; |
2882 | my $faces = $facedata->{faceinfo}; |
2829 | |
2883 | |
2830 | while (my ($face, $info) = each %$faces) { |
2884 | while (my ($face, $info) = each %$faces) { |
2831 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2885 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2832 | cf::face::set_visibility $idx, $info->{visibility}; |
2886 | cf::face::set_visibility $idx, $info->{visibility}; |
2833 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2887 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2834 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2888 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2835 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2889 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2836 | |
2890 | |
2837 | cf::cede_to_tick; |
2891 | cf::cede_to_tick; |
2838 | } |
2892 | } |
2839 | |
2893 | |
2840 | while (my ($face, $info) = each %$faces) { |
2894 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
2865 | |
2919 | |
2866 | { |
2920 | { |
2867 | # TODO: for gcfclient pleasure, we should give resources |
2921 | # TODO: for gcfclient pleasure, we should give resources |
2868 | # that gcfclient doesn't grok a >10000 face index. |
2922 | # that gcfclient doesn't grok a >10000 face index. |
2869 | my $res = $facedata->{resource}; |
2923 | my $res = $facedata->{resource}; |
2870 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2871 | |
2924 | |
2872 | my $soundconf = delete $res->{"res/sound.conf"}; |
2925 | my $soundconf = delete $res->{"res/sound.conf"}; |
2873 | |
2926 | |
2874 | while (my ($name, $info) = each %$res) { |
2927 | 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; |
2928 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
2929 | my $data; |
2881 | |
2930 | |
2882 | if ($info->{type} & 1) { |
2931 | if ($info->{type} & 1) { |
2883 | # prepend meta info |
2932 | # prepend meta info |
2884 | |
2933 | |
|
|
2934 | my $meta = $enc->encode ({ |
|
|
2935 | name => $name, |
|
|
2936 | %{ $info->{meta} || {} }, |
|
|
2937 | }); |
|
|
2938 | |
2885 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
2939 | $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 { |
2940 | } else { |
2890 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
2941 | $data = $info->{data}; |
2891 | } |
2942 | } |
2892 | |
2943 | |
|
|
2944 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2893 | cf::face::set_type $idx, $info->{type}; |
2945 | cf::face::set_type $idx, $info->{type}; |
2894 | |
2946 | |
2895 | cf::cede_to_tick; |
2947 | cf::cede_to_tick; |
2896 | } |
2948 | } |
2897 | |
2949 | |
… | |
… | |
2924 | $ns->fx_want ($k, $v); |
2976 | $ns->fx_want ($k, $v); |
2925 | } |
2977 | } |
2926 | }; |
2978 | }; |
2927 | |
2979 | |
2928 | sub reload_regions { |
2980 | sub reload_regions { |
|
|
2981 | # HACK to clear player env face cache, we need some signal framework |
|
|
2982 | # for this (global event?) |
|
|
2983 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2984 | |
2929 | load_resource_file "$MAPDIR/regions" |
2985 | load_resource_file "$MAPDIR/regions" |
2930 | or die "unable to load regions file\n"; |
2986 | or die "unable to load regions file\n"; |
2931 | |
2987 | |
2932 | for (cf::region::list) { |
2988 | for (cf::region::list) { |
2933 | $_->{match} = qr/$_->{match}/ |
2989 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2969 | |
3025 | |
2970 | sub init { |
3026 | sub init { |
2971 | reload_resources; |
3027 | reload_resources; |
2972 | } |
3028 | } |
2973 | |
3029 | |
2974 | sub cfg_load { |
3030 | sub reload_config { |
2975 | open my $fh, "<:utf8", "$CONFDIR/config" |
3031 | open my $fh, "<:utf8", "$CONFDIR/config" |
2976 | or return; |
3032 | or return; |
2977 | |
3033 | |
2978 | local $/; |
3034 | local $/; |
2979 | *CFG = YAML::Syck::Load <$fh>; |
3035 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
2999 | (async { |
3055 | (async { |
3000 | Event::one_event; |
3056 | Event::one_event; |
3001 | })->prio (Coro::PRIO_MAX); |
3057 | })->prio (Coro::PRIO_MAX); |
3002 | }; |
3058 | }; |
3003 | |
3059 | |
3004 | cfg_load; |
3060 | reload_config; |
3005 | db_init; |
3061 | db_init; |
3006 | load_extensions; |
3062 | load_extensions; |
3007 | |
3063 | |
3008 | $TICK_WATCHER->start; |
3064 | $TICK_WATCHER->start; |
3009 | Event::loop; |
3065 | Event::loop; |
… | |
… | |
3202 | warn "reloading cf.pm"; |
3258 | warn "reloading cf.pm"; |
3203 | require cf; |
3259 | require cf; |
3204 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3260 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3205 | |
3261 | |
3206 | warn "loading config and database again"; |
3262 | warn "loading config and database again"; |
3207 | cf::cfg_load; |
3263 | cf::reload_config; |
3208 | |
3264 | |
3209 | warn "loading extensions"; |
3265 | warn "loading extensions"; |
3210 | cf::load_extensions; |
3266 | cf::load_extensions; |
3211 | |
3267 | |
3212 | warn "reattaching attachments to objects/players"; |
3268 | warn "reattaching attachments to objects/players"; |