… | |
… | |
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. |
… | |
… | |
1950 | } |
1947 | } |
1951 | |
1948 | |
1952 | sub do_load_sync { |
1949 | sub do_load_sync { |
1953 | my ($map) = @_; |
1950 | my ($map) = @_; |
1954 | |
1951 | |
|
|
1952 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
1953 | if $Coro::current == $Coro::main; |
|
|
1954 | |
1955 | cf::sync_job { $map->load }; |
1955 | cf::sync_job { $map->load }; |
1956 | } |
1956 | } |
1957 | |
1957 | |
1958 | our %MAP_PREFETCH; |
1958 | our %MAP_PREFETCH; |
1959 | our $MAP_PREFETCHER = undef; |
1959 | our $MAP_PREFETCHER = undef; |
1960 | |
1960 | |
1961 | sub find_async { |
1961 | sub find_async { |
1962 | my ($path, $origin) = @_; |
1962 | my ($path, $origin, $load) = @_; |
1963 | |
1963 | |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1964 | $path = normalise $path, $origin && $origin->{path}; |
1965 | |
1965 | |
1966 | if (my $map = $cf::MAP{$path}) { |
1966 | if (my $map = $cf::MAP{$path}) { |
1967 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1967 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1968 | } |
1968 | } |
1969 | |
1969 | |
1970 | undef $MAP_PREFETCH{$path}; |
1970 | $MAP_PREFETCH{$path} |= $load; |
|
|
1971 | |
1971 | $MAP_PREFETCHER ||= cf::async { |
1972 | $MAP_PREFETCHER ||= cf::async { |
1972 | while (%MAP_PREFETCH) { |
1973 | while (%MAP_PREFETCH) { |
1973 | for my $path (keys %MAP_PREFETCH) { |
1974 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1974 | if (my $map = find $path) { |
1975 | if (my $map = find $k) { |
1975 | $map->load; |
1976 | $map->load if $v; |
1976 | } |
1977 | } |
1977 | |
1978 | |
1978 | delete $MAP_PREFETCH{$path}; |
1979 | delete $MAP_PREFETCH{$k}; |
1979 | } |
1980 | } |
1980 | } |
1981 | } |
1981 | undef $MAP_PREFETCHER; |
1982 | undef $MAP_PREFETCHER; |
1982 | }; |
1983 | }; |
1983 | $MAP_PREFETCHER->prio (6); |
1984 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
2567 | push @msg, msgtype => "event_$type"; |
2568 | push @msg, msgtype => "event_$type"; |
2568 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2569 | } |
2570 | } |
2570 | } |
2571 | } |
2571 | |
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 | |
2572 | =item $success = $client->query ($flags, "text", \&cb) |
2591 | =item $success = $client->query ($flags, "text", \&cb) |
2573 | |
2592 | |
2574 | Queues a query to the client, calling the given callback with |
2593 | Queues a query to the client, calling the given callback with |
2575 | 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>, |
2576 | 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>. |
… | |
… | |
2634 | my ($type, $reply, @payload) = |
2653 | my ($type, $reply, @payload) = |
2635 | "ARRAY" eq ref $msg |
2654 | "ARRAY" eq ref $msg |
2636 | ? @$msg |
2655 | ? @$msg |
2637 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2656 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2638 | |
2657 | |
|
|
2658 | my @reply; |
|
|
2659 | |
2639 | if (my $cb = $EXTICMD{$type}) { |
2660 | if (my $cb = $EXTICMD{$type}) { |
2640 | my @reply = $cb->($ns, @payload); |
2661 | @reply = $cb->($ns, @payload); |
2641 | |
|
|
2642 | $ns->ext_reply ($reply, @reply) |
|
|
2643 | if $reply; |
|
|
2644 | } |
2662 | } |
|
|
2663 | |
|
|
2664 | $ns->ext_reply ($reply, @reply) |
|
|
2665 | if $reply; |
|
|
2666 | |
2645 | } else { |
2667 | } else { |
2646 | 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"; |
2647 | } |
2669 | } |
2648 | |
2670 | |
2649 | cf::override; |
2671 | cf::override; |
… | |
… | |
2710 | |
2732 | |
2711 | The following functions and methods are available within a safe environment: |
2733 | The following functions and methods are available within a safe environment: |
2712 | |
2734 | |
2713 | cf::object |
2735 | cf::object |
2714 | contr pay_amount pay_player map x y force_find force_add |
2736 | contr pay_amount pay_player map x y force_find force_add |
2715 | insert remove name archname title slaying race |
2737 | insert remove name archname title slaying race decrease_ob_nr |
2716 | |
2738 | |
2717 | cf::object::player |
2739 | cf::object::player |
2718 | player |
2740 | player |
2719 | |
2741 | |
2720 | cf::player |
2742 | cf::player |
… | |
… | |
2725 | |
2747 | |
2726 | =cut |
2748 | =cut |
2727 | |
2749 | |
2728 | for ( |
2750 | for ( |
2729 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2751 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2730 | insert remove inv name archname title slaying race)], |
2752 | insert remove inv name archname title slaying race |
|
|
2753 | decrease_ob_nr)], |
2731 | ["cf::object::player" => qw(player)], |
2754 | ["cf::object::player" => qw(player)], |
2732 | ["cf::player" => qw(peaceful)], |
2755 | ["cf::player" => qw(peaceful)], |
2733 | ["cf::map" => qw(trigger)], |
2756 | ["cf::map" => qw(trigger)], |
2734 | ) { |
2757 | ) { |
2735 | no strict 'refs'; |
2758 | no strict 'refs'; |
… | |
… | |
2825 | |
2848 | |
2826 | $facedata->{version} == 2 |
2849 | $facedata->{version} == 2 |
2827 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2850 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2828 | |
2851 | |
2829 | # patch in the exptable |
2852 | # patch in the exptable |
2830 | cf::cede_to_tick; |
|
|
2831 | $facedata->{resource}{"res/exp_table"} = { |
2853 | $facedata->{resource}{"res/exp_table"} = { |
2832 | type => FT_RSRC, |
2854 | type => FT_RSRC, |
2833 | data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), |
2855 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
2834 | }; |
2856 | }; |
2835 | cf::cede_to_tick; |
2857 | cf::cede_to_tick; |
2836 | |
2858 | |
2837 | { |
2859 | { |
2838 | my $faces = $facedata->{faceinfo}; |
2860 | my $faces = $facedata->{faceinfo}; |
… | |
… | |
2891 | name => $name, |
2913 | name => $name, |
2892 | %{ $info->{meta} || {} }, |
2914 | %{ $info->{meta} || {} }, |
2893 | }); |
2915 | }); |
2894 | |
2916 | |
2895 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2917 | $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
2918 | } else { |
|
|
2919 | $data = $info->{data}; |
2896 | } |
2920 | } |
2897 | |
2921 | |
2898 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2922 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2899 | cf::face::set_type $idx, $info->{type}; |
2923 | cf::face::set_type $idx, $info->{type}; |
2900 | |
2924 | |