… | |
… | |
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 !$load || $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 |
… | |
… | |
2555 | =cut |
2558 | =cut |
2556 | |
2559 | |
2557 | sub cf::client::ext_msg($$@) { |
2560 | sub cf::client::ext_msg($$@) { |
2558 | my ($self, $type, @msg) = @_; |
2561 | my ($self, $type, @msg) = @_; |
2559 | |
2562 | |
2560 | my $extcmd = $self->extcmd; |
|
|
2561 | |
|
|
2562 | if ($extcmd == 2) { |
2563 | if ($self->extcmd == 2) { |
2563 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2564 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2564 | } elsif ($extcmd == 1) { # TODO: remove |
2565 | } elsif ($self->extcmd == 1) { # TODO: remove |
2565 | push @msg, msgtype => "event_$type"; |
2566 | push @msg, msgtype => "event_$type"; |
|
|
2567 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2568 | } |
|
|
2569 | } |
|
|
2570 | |
|
|
2571 | =item $client->ext_reply ($msgid, @msg) |
|
|
2572 | |
|
|
2573 | Sends an ext reply to the client. |
|
|
2574 | |
|
|
2575 | =cut |
|
|
2576 | |
|
|
2577 | sub cf::client::ext_reply($$@) { |
|
|
2578 | my ($self, $id, @msg) = @_; |
|
|
2579 | |
|
|
2580 | if ($self->extcmd == 2) { |
|
|
2581 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2582 | } elsif ($self->extcmd == 1) { |
|
|
2583 | #TODO: version 1, remove |
|
|
2584 | unshift @msg, msgtype => "reply", msgid => $id; |
2566 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2585 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2567 | } |
2586 | } |
2568 | } |
2587 | } |
2569 | |
2588 | |
2570 | =item $success = $client->query ($flags, "text", \&cb) |
2589 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2632 | my ($type, $reply, @payload) = |
2651 | my ($type, $reply, @payload) = |
2633 | "ARRAY" eq ref $msg |
2652 | "ARRAY" eq ref $msg |
2634 | ? @$msg |
2653 | ? @$msg |
2635 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2654 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2636 | |
2655 | |
|
|
2656 | my @reply; |
|
|
2657 | |
2637 | if (my $cb = $EXTICMD{$type}) { |
2658 | if (my $cb = $EXTICMD{$type}) { |
2638 | my @reply = $cb->($ns, @payload); |
2659 | @reply = $cb->($ns, @payload); |
2639 | |
|
|
2640 | $ns->ext_reply ($reply, @reply) |
|
|
2641 | if $reply; |
|
|
2642 | } |
2660 | } |
|
|
2661 | |
|
|
2662 | $ns->ext_reply ($reply, @reply) |
|
|
2663 | if $reply; |
|
|
2664 | |
2643 | } else { |
2665 | } else { |
2644 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2666 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2645 | } |
2667 | } |
2646 | |
2668 | |
2647 | cf::override; |
2669 | cf::override; |
… | |
… | |
2708 | |
2730 | |
2709 | The following functions and methods are available within a safe environment: |
2731 | The following functions and methods are available within a safe environment: |
2710 | |
2732 | |
2711 | cf::object |
2733 | cf::object |
2712 | contr pay_amount pay_player map x y force_find force_add |
2734 | contr pay_amount pay_player map x y force_find force_add |
2713 | insert remove name archname title slaying race |
2735 | insert remove name archname title slaying race decrease_ob_nr |
2714 | |
2736 | |
2715 | cf::object::player |
2737 | cf::object::player |
2716 | player |
2738 | player |
2717 | |
2739 | |
2718 | cf::player |
2740 | cf::player |
… | |
… | |
2723 | |
2745 | |
2724 | =cut |
2746 | =cut |
2725 | |
2747 | |
2726 | for ( |
2748 | for ( |
2727 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2749 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2728 | insert remove inv name archname title slaying race)], |
2750 | insert remove inv name archname title slaying race |
|
|
2751 | decrease_ob_nr)], |
2729 | ["cf::object::player" => qw(player)], |
2752 | ["cf::object::player" => qw(player)], |
2730 | ["cf::player" => qw(peaceful)], |
2753 | ["cf::player" => qw(peaceful)], |
2731 | ["cf::map" => qw(trigger)], |
2754 | ["cf::map" => qw(trigger)], |
2732 | ) { |
2755 | ) { |
2733 | no strict 'refs'; |
2756 | no strict 'refs'; |
… | |
… | |
2809 | # the server's init and main functions |
2832 | # the server's init and main functions |
2810 | |
2833 | |
2811 | sub load_facedata($) { |
2834 | sub load_facedata($) { |
2812 | my ($path) = @_; |
2835 | my ($path) = @_; |
2813 | |
2836 | |
|
|
2837 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2838 | |
2814 | warn "loading facedata from $path\n"; |
2839 | warn "loading facedata from $path\n"; |
2815 | |
2840 | |
2816 | my $facedata; |
2841 | my $facedata; |
2817 | 0 < aio_load $path, $facedata |
2842 | 0 < aio_load $path, $facedata |
2818 | or die "$path: $!"; |
2843 | or die "$path: $!"; |
2819 | |
2844 | |
2820 | $facedata = Coro::Storable::thaw $facedata; |
2845 | $facedata = Coro::Storable::thaw $facedata; |
2821 | |
2846 | |
2822 | $facedata->{version} == 2 |
2847 | $facedata->{version} == 2 |
2823 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2848 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
|
|
2849 | |
|
|
2850 | # patch in the exptable |
|
|
2851 | $facedata->{resource}{"res/exp_table"} = { |
|
|
2852 | type => FT_RSRC, |
|
|
2853 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
2854 | }; |
|
|
2855 | cf::cede_to_tick; |
2824 | |
2856 | |
2825 | { |
2857 | { |
2826 | my $faces = $facedata->{faceinfo}; |
2858 | my $faces = $facedata->{faceinfo}; |
2827 | |
2859 | |
2828 | while (my ($face, $info) = each %$faces) { |
2860 | while (my ($face, $info) = each %$faces) { |
2829 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2861 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2830 | cf::face::set_visibility $idx, $info->{visibility}; |
2862 | cf::face::set_visibility $idx, $info->{visibility}; |
2831 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2863 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2832 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2864 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2833 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2865 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2834 | |
2866 | |
2835 | cf::cede_to_tick; |
2867 | cf::cede_to_tick; |
2836 | } |
2868 | } |
2837 | |
2869 | |
2838 | while (my ($face, $info) = each %$faces) { |
2870 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
2863 | |
2895 | |
2864 | { |
2896 | { |
2865 | # TODO: for gcfclient pleasure, we should give resources |
2897 | # TODO: for gcfclient pleasure, we should give resources |
2866 | # that gcfclient doesn't grok a >10000 face index. |
2898 | # that gcfclient doesn't grok a >10000 face index. |
2867 | my $res = $facedata->{resource}; |
2899 | my $res = $facedata->{resource}; |
2868 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2869 | |
2900 | |
2870 | my $soundconf = delete $res->{"res/sound.conf"}; |
2901 | my $soundconf = delete $res->{"res/sound.conf"}; |
2871 | |
2902 | |
2872 | while (my ($name, $info) = each %$res) { |
2903 | 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; |
2904 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
2905 | my $data; |
2879 | |
2906 | |
2880 | if ($info->{type} & 1) { |
2907 | if ($info->{type} & 1) { |
2881 | # prepend meta info |
2908 | # prepend meta info |
2882 | |
2909 | |
|
|
2910 | my $meta = $enc->encode ({ |
|
|
2911 | name => $name, |
|
|
2912 | %{ $info->{meta} || {} }, |
|
|
2913 | }); |
|
|
2914 | |
2883 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
2915 | $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 { |
2916 | } else { |
2888 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
2917 | $data = $info->{data}; |
2889 | } |
2918 | } |
2890 | |
2919 | |
|
|
2920 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2891 | cf::face::set_type $idx, $info->{type}; |
2921 | cf::face::set_type $idx, $info->{type}; |
2892 | |
2922 | |
2893 | cf::cede_to_tick; |
2923 | cf::cede_to_tick; |
2894 | } |
2924 | } |
2895 | |
2925 | |