| … | |
… | |
| 1181 | my ($pl, $buf) = @_; |
1181 | my ($pl, $buf) = @_; |
| 1182 | |
1182 | |
| 1183 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1183 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
| 1184 | |
1184 | |
| 1185 | if (ref $msg) { |
1185 | if (ref $msg) { |
|
|
1186 | my ($type, $reply, @payload) = |
|
|
1187 | "ARRAY" eq ref $msg |
|
|
1188 | ? @$msg |
|
|
1189 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
|
|
1190 | |
| 1186 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1191 | if (my $cb = $EXTCMD{$type}) { |
| 1187 | if (my %reply = $cb->($pl, $msg)) { |
1192 | my @reply = $cb->($pl, @payload); |
|
|
1193 | |
| 1188 | $pl->ext_reply ($msg->{msgid}, %reply); |
1194 | $pl->ext_reply ($reply, @reply) |
| 1189 | } |
1195 | if $reply; |
| 1190 | } |
1196 | } |
| 1191 | } else { |
1197 | } else { |
| 1192 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1198 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
| 1193 | } |
1199 | } |
| 1194 | |
1200 | |
| … | |
… | |
| 1517 | sub hintmode { |
1523 | sub hintmode { |
| 1518 | $_[0]{hintmode} = $_[1] if @_ > 1; |
1524 | $_[0]{hintmode} = $_[1] if @_ > 1; |
| 1519 | $_[0]{hintmode} |
1525 | $_[0]{hintmode} |
| 1520 | } |
1526 | } |
| 1521 | |
1527 | |
| 1522 | =item $player->ext_reply ($msgid, %msg) |
1528 | =item $player->ext_reply ($msgid, @msg) |
| 1523 | |
1529 | |
| 1524 | Sends an ext reply to the player. |
1530 | Sends an ext reply to the player. |
| 1525 | |
1531 | |
| 1526 | =cut |
1532 | =cut |
| 1527 | |
1533 | |
| 1528 | sub ext_reply($$%) { |
1534 | sub ext_reply($$@) { |
| 1529 | my ($self, $id, %msg) = @_; |
1535 | my ($self, $id, @msg) = @_; |
| 1530 | |
1536 | |
| 1531 | $msg{msgid} = $id; |
1537 | if ($self->ns->extcmd == 2) { |
|
|
1538 | $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg])); |
|
|
1539 | } elsif ($self->ns->extcmd == 1) { |
|
|
1540 | #TODO: version 1, remove |
|
|
1541 | unshift @msg, msgtype => "reply", msgid => $id; |
| 1532 | $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); |
1542 | $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg})); |
|
|
1543 | } |
| 1533 | } |
1544 | } |
| 1534 | |
1545 | |
| 1535 | =item $player->ext_event ($type, %msg) |
1546 | =item $player->ext_msg ($type, @msg) |
| 1536 | |
1547 | |
| 1537 | Sends an ext event to the client. |
1548 | Sends an ext event to the client. |
| 1538 | |
1549 | |
| 1539 | =cut |
1550 | =cut |
| 1540 | |
1551 | |
| 1541 | sub ext_event($$%) { |
1552 | sub ext_msg($$@) { |
| 1542 | my ($self, $type, %msg) = @_; |
1553 | my ($self, $type, @msg) = @_; |
| 1543 | |
1554 | |
| 1544 | $self->ns->ext_event ($type, %msg); |
1555 | $self->ns->ext_msg ($type, @msg); |
| 1545 | } |
1556 | } |
| 1546 | |
1557 | |
| 1547 | =head3 cf::region |
1558 | =head3 cf::region |
| 1548 | |
1559 | |
| 1549 | =over 4 |
1560 | =over 4 |
| … | |
… | |
| 2219 | |
2230 | |
| 2220 | } else { |
2231 | } else { |
| 2221 | my $pl = $self->contr; |
2232 | my $pl = $self->contr; |
| 2222 | |
2233 | |
| 2223 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
2234 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
| 2224 | my $diag = $pl->{npc_dialog}; |
2235 | my $dialog = $pl->{npc_dialog}; |
| 2225 | $diag->{pl}->ext_reply ( |
2236 | $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); |
| 2226 | $diag->{id}, |
|
|
| 2227 | msgtype => "reply", |
|
|
| 2228 | msg => $diag->{pl}->expand_cfpod ($msg), |
|
|
| 2229 | add_topics => [] |
|
|
| 2230 | ); |
|
|
| 2231 | |
2237 | |
| 2232 | } else { |
2238 | } else { |
| 2233 | $msg = $npc->name . " says: $msg" if $npc; |
2239 | $msg = $npc->name . " says: $msg" if $npc; |
| 2234 | $self->message ($msg, $flags); |
2240 | $self->message ($msg, $flags); |
| 2235 | } |
2241 | } |
| … | |
… | |
| 2506 | sub cf::client::send_msg { |
2512 | sub cf::client::send_msg { |
| 2507 | my ($self, $channel, $msg, $color, @extra) = @_; |
2513 | my ($self, $channel, $msg, $color, @extra) = @_; |
| 2508 | |
2514 | |
| 2509 | $msg = $self->pl->expand_cfpod ($msg); |
2515 | $msg = $self->pl->expand_cfpod ($msg); |
| 2510 | |
2516 | |
| 2511 | $color &= ~cf::NDI_UNIQUE; # just in case... |
2517 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
| 2512 | |
2518 | |
| 2513 | if (ref $channel) { |
2519 | if (ref $channel) { |
| 2514 | # send meta info to client, if not yet sent |
2520 | # send meta info to client, if not yet sent |
| 2515 | unless (exists $self->{channel}{$channel->{id}}) { |
2521 | unless (exists $self->{channel}{$channel->{id}}) { |
| 2516 | $self->{channel}{$channel->{id}} = $channel; |
2522 | $self->{channel}{$channel->{id}} = $channel; |
| 2517 | $self->ext_event (channel_info => %$channel); |
2523 | $self->ext_msg (channel_info => $channel); |
| 2518 | } |
2524 | } |
| 2519 | |
2525 | |
| 2520 | $channel = $channel->{id}; |
2526 | $channel = $channel->{id}; |
| 2521 | } |
2527 | } |
| 2522 | |
2528 | |
| 2523 | return unless @extra || length $msg; |
2529 | return unless @extra || length $msg; |
| 2524 | |
2530 | |
| 2525 | if ($self->can_msg) { |
2531 | if ($self->can_msg) { |
|
|
2532 | # default colour, mask it out |
|
|
2533 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
|
|
2534 | if $color & cf::NDI_DEF; |
|
|
2535 | |
| 2526 | $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); |
2536 | $self->send_packet ("msg " . $self->{json_coder}->encode ( |
|
|
2537 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); |
| 2527 | } else { |
2538 | } else { |
| 2528 | # replace some tags by gcfclient-compatible ones |
|
|
| 2529 | for ($msg) { |
|
|
| 2530 | 1 while |
|
|
| 2531 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
| 2532 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
| 2533 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
| 2534 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
| 2535 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
| 2536 | } |
|
|
| 2537 | |
|
|
| 2538 | if ($color >= 0) { |
2539 | if ($color >= 0) { |
|
|
2540 | # replace some tags by gcfclient-compatible ones |
|
|
2541 | for ($msg) { |
|
|
2542 | 1 while |
|
|
2543 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
2544 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
2545 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
2546 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
2547 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
2548 | } |
|
|
2549 | |
|
|
2550 | $color &= cf::NDI_COLOR_MASK; |
|
|
2551 | |
| 2539 | if (0 && $msg =~ /\[/) { |
2552 | if (0 && $msg =~ /\[/) { |
| 2540 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2553 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
| 2541 | } else { |
2554 | } else { |
| 2542 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2555 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
| 2543 | $self->send_packet ("drawinfo $color $msg") |
2556 | $self->send_packet ("drawinfo $color $msg") |
| 2544 | } |
2557 | } |
| 2545 | } |
2558 | } |
| 2546 | } |
2559 | } |
| 2547 | } |
2560 | } |
| 2548 | |
2561 | |
| 2549 | =item $client->ext_event ($type, %msg) |
2562 | =item $client->ext_msg ($type, @msg) |
| 2550 | |
2563 | |
| 2551 | Sends an ext event to the client. |
2564 | Sends an ext event to the client. |
| 2552 | |
2565 | |
| 2553 | =cut |
2566 | =cut |
| 2554 | |
2567 | |
| 2555 | sub cf::client::ext_event($$%) { |
2568 | sub cf::client::ext_msg($$@) { |
| 2556 | my ($self, $type, %msg) = @_; |
2569 | my ($self, $type, @msg) = @_; |
| 2557 | |
2570 | |
| 2558 | return unless $self->extcmd; |
2571 | my $extcmd = $self->extcmd; |
| 2559 | |
2572 | |
|
|
2573 | if ($extcmd == 2) { |
|
|
2574 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
|
|
2575 | } elsif ($extcmd == 1) { # TODO: remove |
| 2560 | $msg{msgtype} = "event_$type"; |
2576 | push @msg, msgtype => "event_$type"; |
| 2561 | $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); |
2577 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2578 | } |
| 2562 | } |
2579 | } |
| 2563 | |
2580 | |
| 2564 | =item $success = $client->query ($flags, "text", \&cb) |
2581 | =item $success = $client->query ($flags, "text", \&cb) |
| 2565 | |
2582 | |
| 2566 | Queues a query to the client, calling the given callback with |
2583 | Queues a query to the client, calling the given callback with |
| … | |
… | |
| 2621 | my ($ns, $buf) = @_; |
2638 | my ($ns, $buf) = @_; |
| 2622 | |
2639 | |
| 2623 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
2640 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
| 2624 | |
2641 | |
| 2625 | if (ref $msg) { |
2642 | if (ref $msg) { |
|
|
2643 | my ($type, $reply, @payload) = |
|
|
2644 | "ARRAY" eq ref $msg |
|
|
2645 | ? @$msg |
|
|
2646 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
|
|
2647 | |
| 2626 | if (my $cb = $EXTICMD{$msg->{msgtype}}) { |
2648 | if (my $cb = $EXTICMD{$type}) { |
| 2627 | if (my %reply = $cb->($ns, $msg)) { |
2649 | my @reply = $cb->($ns, @payload); |
| 2628 | $reply{msgid} = $msg->{msgid}; |
2650 | |
| 2629 | $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); |
2651 | $ns->ext_reply ($reply, @reply) |
| 2630 | } |
2652 | if $reply; |
| 2631 | } |
2653 | } |
| 2632 | } else { |
2654 | } else { |
| 2633 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2655 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
| 2634 | } |
2656 | } |
| 2635 | |
2657 | |
| … | |
… | |
| 2850 | # TODO: for gcfclient pleasure, we should give resources |
2872 | # TODO: for gcfclient pleasure, we should give resources |
| 2851 | # that gcfclient doesn't grok a >10000 face index. |
2873 | # that gcfclient doesn't grok a >10000 face index. |
| 2852 | my $res = $facedata->{resource}; |
2874 | my $res = $facedata->{resource}; |
| 2853 | my $enc = JSON::XS->new->utf8->canonical; |
2875 | my $enc = JSON::XS->new->utf8->canonical; |
| 2854 | |
2876 | |
|
|
2877 | my $soundconf = delete $res->{"res/sound.conf"}; |
|
|
2878 | |
| 2855 | while (my ($name, $info) = each %$res) { |
2879 | while (my ($name, $info) = each %$res) { |
| 2856 | my $meta = $enc->encode ({ |
2880 | my $meta = $enc->encode ({ |
| 2857 | name => $name, |
2881 | name => $name, |
| 2858 | type => $info->{type}, |
2882 | %{ $info->{meta} || {} }, |
| 2859 | copyright => $info->{copyright}, #TODO# |
|
|
| 2860 | }); |
2883 | }); |
| 2861 | |
2884 | |
| 2862 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
2885 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
| 2863 | |
2886 | |
| 2864 | if ($name =~ /\.jpg$/) { |
2887 | if ($info->{type} & 1) { |
| 2865 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack |
2888 | # prepend meta info |
| 2866 | cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack |
2889 | |
| 2867 | } else { |
|
|
| 2868 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
2890 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
| 2869 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
2891 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
| 2870 | |
2892 | |
| 2871 | cf::face::set_type $idx, 1; |
|
|
| 2872 | cf::face::set_data $idx, 0, $data, $chk; |
2893 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2894 | } else { |
|
|
2895 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
| 2873 | } |
2896 | } |
| 2874 | |
2897 | |
|
|
2898 | cf::face::set_type $idx, $info->{type}; |
|
|
2899 | |
| 2875 | cf::cede_to_tick; |
2900 | cf::cede_to_tick; |
| 2876 | } |
2901 | } |
|
|
2902 | |
|
|
2903 | if ($soundconf) { |
|
|
2904 | $soundconf = $enc->decode (delete $soundconf->{data}); |
|
|
2905 | |
|
|
2906 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
2907 | my $sound = $soundconf->{compat}[$_] |
|
|
2908 | or next; |
|
|
2909 | |
|
|
2910 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
2911 | |
|
|
2912 | cf::sound::set $sound->[0] => $face; |
|
|
2913 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
2914 | } |
|
|
2915 | |
|
|
2916 | #TODO |
|
|
2917 | } |
| 2877 | } |
2918 | } |
| 2878 | |
2919 | |
| 2879 | 1 |
2920 | 1 |
| 2880 | } |
2921 | } |
|
|
2922 | |
|
|
2923 | register_exticmd fx_want => sub { |
|
|
2924 | my ($ns, $want) = @_; |
|
|
2925 | |
|
|
2926 | while (my ($k, $v) = each %$want) { |
|
|
2927 | $ns->fx_want ($k, $v); |
|
|
2928 | } |
|
|
2929 | }; |
| 2881 | |
2930 | |
| 2882 | sub reload_regions { |
2931 | sub reload_regions { |
| 2883 | load_resource_file "$MAPDIR/regions" |
2932 | load_resource_file "$MAPDIR/regions" |
| 2884 | or die "unable to load regions file\n"; |
2933 | or die "unable to load regions file\n"; |
| 2885 | |
2934 | |
