… | |
… | |
1149 | my ($type, $reply, @payload) = |
1149 | my ($type, $reply, @payload) = |
1150 | "ARRAY" eq ref $msg |
1150 | "ARRAY" eq ref $msg |
1151 | ? @$msg |
1151 | ? @$msg |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1153 | |
1153 | |
|
|
1154 | my @reply; |
|
|
1155 | |
1154 | if (my $cb = $EXTCMD{$type}) { |
1156 | if (my $cb = $EXTCMD{$type}) { |
1155 | my @reply = $cb->($pl, @payload); |
1157 | @reply = $cb->($pl, @payload); |
1156 | |
|
|
1157 | $pl->ext_reply ($reply, @reply) |
|
|
1158 | if $reply; |
|
|
1159 | } |
1158 | } |
|
|
1159 | |
|
|
1160 | $pl->ext_reply ($reply, @reply) |
|
|
1161 | if $reply; |
|
|
1162 | |
1160 | } else { |
1163 | } else { |
1161 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1164 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1162 | } |
1165 | } |
1163 | |
1166 | |
1164 | cf::override; |
1167 | cf::override; |
… | |
… | |
1505 | =cut |
1508 | =cut |
1506 | |
1509 | |
1507 | sub ext_reply($$@) { |
1510 | sub ext_reply($$@) { |
1508 | my ($self, $id, @msg) = @_; |
1511 | my ($self, $id, @msg) = @_; |
1509 | |
1512 | |
1510 | if ($self->ns->extcmd == 2) { |
1513 | $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 | } |
1514 | } |
1518 | |
1515 | |
1519 | =item $player->ext_msg ($type, @msg) |
1516 | =item $player->ext_msg ($type, @msg) |
1520 | |
1517 | |
1521 | Sends an ext event to the client. |
1518 | Sends an ext event to the client. |
… | |
… | |
1916 | |
1913 | |
1917 | $self |
1914 | $self |
1918 | } |
1915 | } |
1919 | |
1916 | |
1920 | # find and load all maps in the 3x3 area around a map |
1917 | # find and load all maps in the 3x3 area around a map |
1921 | sub load_diag { |
1918 | sub load_neighbours { |
1922 | my ($map) = @_; |
1919 | my ($map) = @_; |
1923 | |
1920 | |
1924 | my @diag; # diagonal neighbours |
1921 | my @neigh; # diagonal neighbours |
1925 | |
1922 | |
1926 | for (0 .. 3) { |
1923 | for (0 .. 3) { |
1927 | my $neigh = $map->tile_path ($_) |
1924 | my $neigh = $map->tile_path ($_) |
1928 | or next; |
1925 | or next; |
1929 | $neigh = find $neigh, $map |
1926 | $neigh = find $neigh, $map |
1930 | or next; |
1927 | or next; |
1931 | $neigh->load; |
1928 | $neigh->load; |
1932 | |
1929 | |
|
|
1930 | push @neigh, |
1933 | push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], |
1931 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
1934 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
1932 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
1935 | } |
1933 | } |
1936 | |
1934 | |
1937 | for (@diag) { |
1935 | for (grep defined $_->[0], @neigh) { |
|
|
1936 | my ($path, $origin) = @$_; |
1938 | my $neigh = find @$_ |
1937 | my $neigh = find $path, $origin |
1939 | or next; |
1938 | or next; |
1940 | $neigh->load; |
1939 | $neigh->load; |
1941 | } |
1940 | } |
1942 | } |
1941 | } |
1943 | |
1942 | |
… | |
… | |
1948 | } |
1947 | } |
1949 | |
1948 | |
1950 | sub do_load_sync { |
1949 | sub do_load_sync { |
1951 | my ($map) = @_; |
1950 | my ($map) = @_; |
1952 | |
1951 | |
|
|
1952 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1953 | if $Coro::current != $Coro::main; |
|
|
1954 | |
1953 | cf::sync_job { $map->load }; |
1955 | cf::sync_job { $map->load }; |
1954 | } |
1956 | } |
1955 | |
1957 | |
1956 | our %MAP_PREFETCH; |
1958 | our %MAP_PREFETCH; |
1957 | our $MAP_PREFETCHER = undef; |
1959 | our $MAP_PREFETCHER = undef; |
1958 | |
1960 | |
1959 | sub find_async { |
1961 | sub find_async { |
1960 | my ($path, $origin) = @_; |
1962 | my ($path, $origin, $load) = @_; |
1961 | |
1963 | |
1962 | $path = normalise $path, $origin && $origin->{path}; |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1963 | |
1965 | |
1964 | if (my $map = $cf::MAP{$path}) { |
1966 | if (my $map = $cf::MAP{$path}) { |
1965 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1966 | } |
1968 | } |
1967 | |
1969 | |
1968 | undef $MAP_PREFETCH{$path}; |
1970 | $MAP_PREFETCH{$path} |= $load; |
|
|
1971 | |
1969 | $MAP_PREFETCHER ||= cf::async { |
1972 | $MAP_PREFETCHER ||= cf::async { |
1970 | while (%MAP_PREFETCH) { |
1973 | while (%MAP_PREFETCH) { |
1971 | for my $path (keys %MAP_PREFETCH) { |
1974 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1972 | if (my $map = find $path) { |
1975 | if (my $map = find $k) { |
1973 | $map->load; |
1976 | $map->load if $v; |
1974 | } |
1977 | } |
1975 | |
1978 | |
1976 | delete $MAP_PREFETCH{$path}; |
1979 | delete $MAP_PREFETCH{$k}; |
1977 | } |
1980 | } |
1978 | } |
1981 | } |
1979 | undef $MAP_PREFETCHER; |
1982 | undef $MAP_PREFETCHER; |
1980 | }; |
1983 | }; |
1981 | $MAP_PREFETCHER->prio (6); |
1984 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
2312 | # use -1 or undef as default coordinates, not 0, 0 |
2315 | # use -1 or undef as default coordinates, not 0, 0 |
2313 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2316 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2314 | if $x <=0 && $y <= 0; |
2317 | if $x <=0 && $y <= 0; |
2315 | |
2318 | |
2316 | $map->load; |
2319 | $map->load; |
2317 | $map->load_diag; |
2320 | $map->load_neighbours; |
2318 | |
2321 | |
2319 | return unless $self->contr->active; |
2322 | return unless $self->contr->active; |
2320 | $self->activate_recursive; |
2323 | $self->activate_recursive; |
2321 | |
2324 | |
2322 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2325 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
… | |
… | |
2565 | push @msg, msgtype => "event_$type"; |
2568 | push @msg, msgtype => "event_$type"; |
2566 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2567 | } |
2570 | } |
2568 | } |
2571 | } |
2569 | |
2572 | |
|
|
2573 | =item $client->ext_reply ($msgid, @msg) |
|
|
2574 | |
|
|
2575 | Sends an ext reply to the client. |
|
|
2576 | |
|
|
2577 | =cut |
|
|
2578 | |
|
|
2579 | sub cf::client::ext_reply($$@) { |
|
|
2580 | my ($self, $id, @msg) = @_; |
|
|
2581 | |
|
|
2582 | if ($self->extcmd == 2) { |
|
|
2583 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2584 | } elsif ($self->ns->extcmd == 1) { |
|
|
2585 | #TODO: version 1, remove |
|
|
2586 | unshift @msg, msgtype => "reply", msgid => $id; |
|
|
2587 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2588 | } |
|
|
2589 | } |
|
|
2590 | |
2570 | =item $success = $client->query ($flags, "text", \&cb) |
2591 | =item $success = $client->query ($flags, "text", \&cb) |
2571 | |
2592 | |
2572 | Queues a query to the client, calling the given callback with |
2593 | Queues a query to the client, calling the given callback with |
2573 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2594 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2574 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
2595 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
… | |
… | |
2632 | my ($type, $reply, @payload) = |
2653 | my ($type, $reply, @payload) = |
2633 | "ARRAY" eq ref $msg |
2654 | "ARRAY" eq ref $msg |
2634 | ? @$msg |
2655 | ? @$msg |
2635 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2656 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2636 | |
2657 | |
|
|
2658 | my @reply; |
|
|
2659 | |
2637 | if (my $cb = $EXTICMD{$type}) { |
2660 | if (my $cb = $EXTICMD{$type}) { |
2638 | my @reply = $cb->($ns, @payload); |
2661 | @reply = $cb->($ns, @payload); |
2639 | |
|
|
2640 | $ns->ext_reply ($reply, @reply) |
|
|
2641 | if $reply; |
|
|
2642 | } |
2662 | } |
|
|
2663 | |
|
|
2664 | $ns->ext_reply ($reply, @reply) |
|
|
2665 | if $reply; |
|
|
2666 | |
2643 | } else { |
2667 | } else { |
2644 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2668 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2645 | } |
2669 | } |
2646 | |
2670 | |
2647 | cf::override; |
2671 | cf::override; |
… | |
… | |
2809 | # the server's init and main functions |
2833 | # the server's init and main functions |
2810 | |
2834 | |
2811 | sub load_facedata($) { |
2835 | sub load_facedata($) { |
2812 | my ($path) = @_; |
2836 | my ($path) = @_; |
2813 | |
2837 | |
|
|
2838 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2839 | |
2814 | warn "loading facedata from $path\n"; |
2840 | warn "loading facedata from $path\n"; |
2815 | |
2841 | |
2816 | my $facedata; |
2842 | my $facedata; |
2817 | 0 < aio_load $path, $facedata |
2843 | 0 < aio_load $path, $facedata |
2818 | or die "$path: $!"; |
2844 | or die "$path: $!"; |
2819 | |
2845 | |
2820 | $facedata = Coro::Storable::thaw $facedata; |
2846 | $facedata = Coro::Storable::thaw $facedata; |
2821 | |
2847 | |
2822 | $facedata->{version} == 2 |
2848 | $facedata->{version} == 2 |
2823 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2849 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
|
|
2850 | |
|
|
2851 | # patch in the exptable |
|
|
2852 | $facedata->{resource}{"res/exp_table"} = { |
|
|
2853 | type => FT_RSRC, |
|
|
2854 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
2855 | }; |
|
|
2856 | cf::cede_to_tick; |
2824 | |
2857 | |
2825 | { |
2858 | { |
2826 | my $faces = $facedata->{faceinfo}; |
2859 | my $faces = $facedata->{faceinfo}; |
2827 | |
2860 | |
2828 | while (my ($face, $info) = each %$faces) { |
2861 | while (my ($face, $info) = each %$faces) { |
2829 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2862 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2830 | cf::face::set_visibility $idx, $info->{visibility}; |
2863 | cf::face::set_visibility $idx, $info->{visibility}; |
2831 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2864 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2832 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2865 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2833 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2866 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2834 | |
2867 | |
2835 | cf::cede_to_tick; |
2868 | cf::cede_to_tick; |
2836 | } |
2869 | } |
2837 | |
2870 | |
2838 | while (my ($face, $info) = each %$faces) { |
2871 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
2863 | |
2896 | |
2864 | { |
2897 | { |
2865 | # TODO: for gcfclient pleasure, we should give resources |
2898 | # TODO: for gcfclient pleasure, we should give resources |
2866 | # that gcfclient doesn't grok a >10000 face index. |
2899 | # that gcfclient doesn't grok a >10000 face index. |
2867 | my $res = $facedata->{resource}; |
2900 | my $res = $facedata->{resource}; |
2868 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2869 | |
2901 | |
2870 | my $soundconf = delete $res->{"res/sound.conf"}; |
2902 | my $soundconf = delete $res->{"res/sound.conf"}; |
2871 | |
2903 | |
2872 | while (my ($name, $info) = each %$res) { |
2904 | while (my ($name, $info) = each %$res) { |
2873 | my $meta = $enc->encode ({ |
|
|
2874 | name => $name, |
|
|
2875 | %{ $info->{meta} || {} }, |
|
|
2876 | }); |
|
|
2877 | |
|
|
2878 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
2905 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
2906 | my $data; |
2879 | |
2907 | |
2880 | if ($info->{type} & 1) { |
2908 | if ($info->{type} & 1) { |
2881 | # prepend meta info |
2909 | # prepend meta info |
2882 | |
2910 | |
|
|
2911 | my $meta = $enc->encode ({ |
|
|
2912 | name => $name, |
|
|
2913 | %{ $info->{meta} || {} }, |
|
|
2914 | }); |
|
|
2915 | |
2883 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
2916 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2884 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
|
|
2885 | |
|
|
2886 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2887 | } else { |
2917 | } else { |
2888 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
2918 | $data = $info->{data}; |
2889 | } |
2919 | } |
2890 | |
2920 | |
|
|
2921 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2891 | cf::face::set_type $idx, $info->{type}; |
2922 | cf::face::set_type $idx, $info->{type}; |
2892 | |
2923 | |
2893 | cf::cede_to_tick; |
2924 | cf::cede_to_tick; |
2894 | } |
2925 | } |
2895 | |
2926 | |