| … | |
… | |
| 322 | }; |
322 | }; |
| 323 | $TICK_WATCHER->stop; |
323 | $TICK_WATCHER->stop; |
| 324 | $guard |
324 | $guard |
| 325 | } |
325 | } |
| 326 | |
326 | |
|
|
327 | =item cf::get_slot $time[, $priority[, $name]] |
|
|
328 | |
|
|
329 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
|
|
330 | This call blocks and returns only when you have at least C<$time> seconds |
|
|
331 | of cpu time till the next tick. The slot is only valid till the next cede. |
|
|
332 | |
|
|
333 | The optional C<$name> can be used to identify the job to run. It might be |
|
|
334 | used for statistical purposes and should identify the same time-class. |
|
|
335 | |
|
|
336 | Useful for short background jobs. |
|
|
337 | |
|
|
338 | =cut |
|
|
339 | |
|
|
340 | our @SLOT_QUEUE; |
|
|
341 | our $SLOT_QUEUE; |
|
|
342 | |
|
|
343 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
|
|
344 | $SLOT_QUEUE = Coro::async { |
|
|
345 | my $signal = new Coro::Signal; |
|
|
346 | |
|
|
347 | while () { |
|
|
348 | next_job: |
|
|
349 | my $avail = cf::till_tick; |
|
|
350 | if ($avail > 0.01) { |
|
|
351 | for (0 .. $#SLOT_QUEUE) { |
|
|
352 | if ($SLOT_QUEUE[$_][0] < $avail) { |
|
|
353 | my $job = splice @SLOT_QUEUE, $_, 1, (); |
|
|
354 | $job->[2]->send; |
|
|
355 | Coro::cede; |
|
|
356 | goto next_job; |
|
|
357 | } |
|
|
358 | } |
|
|
359 | } |
|
|
360 | |
|
|
361 | if (@SLOT_QUEUE) { |
|
|
362 | # we do not use wait_For_tick() as it returns immediately when tick is inactive |
|
|
363 | push @cf::WAIT_FOR_TICK, $signal; |
|
|
364 | $signal->wait; |
|
|
365 | } else { |
|
|
366 | Coro::schedule; |
|
|
367 | } |
|
|
368 | } |
|
|
369 | }; |
|
|
370 | |
|
|
371 | sub get_slot($;$$) { |
|
|
372 | my ($time, $pri, $name) = @_; |
|
|
373 | |
|
|
374 | $time = $TICK * .6 if $time > $TICK * .6; |
|
|
375 | my $sig = new Coro::Signal; |
|
|
376 | |
|
|
377 | push @SLOT_QUEUE, [$time, $pri, $sig, $name]; |
|
|
378 | @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; |
|
|
379 | $SLOT_QUEUE->ready; |
|
|
380 | $sig->wait; |
|
|
381 | } |
|
|
382 | |
| 327 | =item cf::async { BLOCK } |
383 | =item cf::async { BLOCK } |
| 328 | |
384 | |
| 329 | Currently the same as Coro::async_pool, meaning you cannot use |
385 | Currently the same as Coro::async_pool, meaning you cannot use |
| 330 | C<on_destroy>, C<join> or other gimmicks on these coroutines. The only |
386 | C<on_destroy>, C<join> or other gimmicks on these coroutines. The only |
| 331 | thing you are allowed to do is call C<prio> on it. |
387 | thing you are allowed to do is call C<prio> on it. |
| … | |
… | |
| 1125 | my ($pl, $buf) = @_; |
1181 | my ($pl, $buf) = @_; |
| 1126 | |
1182 | |
| 1127 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1183 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
| 1128 | |
1184 | |
| 1129 | 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 | |
| 1130 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1191 | if (my $cb = $EXTCMD{$type}) { |
| 1131 | if (my %reply = $cb->($pl, $msg)) { |
1192 | my @reply = $cb->($pl, @payload); |
|
|
1193 | |
| 1132 | $pl->ext_reply ($msg->{msgid}, %reply); |
1194 | $pl->ext_reply ($reply, @reply) |
| 1133 | } |
1195 | if $reply; |
| 1134 | } |
1196 | } |
| 1135 | } else { |
1197 | } else { |
| 1136 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1198 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
| 1137 | } |
1199 | } |
| 1138 | |
1200 | |
| … | |
… | |
| 1461 | sub hintmode { |
1523 | sub hintmode { |
| 1462 | $_[0]{hintmode} = $_[1] if @_ > 1; |
1524 | $_[0]{hintmode} = $_[1] if @_ > 1; |
| 1463 | $_[0]{hintmode} |
1525 | $_[0]{hintmode} |
| 1464 | } |
1526 | } |
| 1465 | |
1527 | |
| 1466 | =item $player->ext_reply ($msgid, %msg) |
1528 | =item $player->ext_reply ($msgid, @msg) |
| 1467 | |
1529 | |
| 1468 | Sends an ext reply to the player. |
1530 | Sends an ext reply to the player. |
| 1469 | |
1531 | |
| 1470 | =cut |
1532 | =cut |
| 1471 | |
1533 | |
| 1472 | sub ext_reply($$%) { |
1534 | sub ext_reply($$@) { |
| 1473 | my ($self, $id, %msg) = @_; |
1535 | my ($self, $id, @msg) = @_; |
| 1474 | |
1536 | |
| 1475 | $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; |
| 1476 | $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); |
1542 | $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg})); |
|
|
1543 | } |
| 1477 | } |
1544 | } |
| 1478 | |
1545 | |
| 1479 | =item $player->ext_event ($type, %msg) |
1546 | =item $player->ext_msg ($type, @msg) |
| 1480 | |
1547 | |
| 1481 | Sends an ext event to the client. |
1548 | Sends an ext event to the client. |
| 1482 | |
1549 | |
| 1483 | =cut |
1550 | =cut |
| 1484 | |
1551 | |
| 1485 | sub ext_event($$%) { |
1552 | sub ext_msg($$@) { |
| 1486 | my ($self, $type, %msg) = @_; |
1553 | my ($self, $type, @msg) = @_; |
| 1487 | |
1554 | |
| 1488 | $self->ns->ext_event ($type, %msg); |
1555 | $self->ns->ext_msg ($type, @msg); |
| 1489 | } |
1556 | } |
| 1490 | |
1557 | |
| 1491 | =head3 cf::region |
1558 | =head3 cf::region |
| 1492 | |
1559 | |
| 1493 | =over 4 |
1560 | =over 4 |
| … | |
… | |
| 1854 | $self->set_darkness_map; |
1921 | $self->set_darkness_map; |
| 1855 | Coro::cede; |
1922 | Coro::cede; |
| 1856 | $self->activate; |
1923 | $self->activate; |
| 1857 | } |
1924 | } |
| 1858 | |
1925 | |
|
|
1926 | $self->{last_save} = $cf::RUNTIME; |
|
|
1927 | $self->last_access ($cf::RUNTIME); |
|
|
1928 | |
| 1859 | $self->in_memory (cf::MAP_IN_MEMORY); |
1929 | $self->in_memory (cf::MAP_IN_MEMORY); |
| 1860 | } |
1930 | } |
| 1861 | |
1931 | |
| 1862 | $self->post_load; |
1932 | $self->post_load; |
| 1863 | } |
1933 | } |
| … | |
… | |
| 2163 | |
2233 | |
| 2164 | } else { |
2234 | } else { |
| 2165 | my $pl = $self->contr; |
2235 | my $pl = $self->contr; |
| 2166 | |
2236 | |
| 2167 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
2237 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
| 2168 | my $diag = $pl->{npc_dialog}; |
2238 | my $dialog = $pl->{npc_dialog}; |
| 2169 | $diag->{pl}->ext_reply ( |
2239 | $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); |
| 2170 | $diag->{id}, |
|
|
| 2171 | msgtype => "reply", |
|
|
| 2172 | msg => $diag->{pl}->expand_cfpod ($msg), |
|
|
| 2173 | add_topics => [] |
|
|
| 2174 | ); |
|
|
| 2175 | |
2240 | |
| 2176 | } else { |
2241 | } else { |
| 2177 | $msg = $npc->name . " says: $msg" if $npc; |
2242 | $msg = $npc->name . " says: $msg" if $npc; |
| 2178 | $self->message ($msg, $flags); |
2243 | $self->message ($msg, $flags); |
| 2179 | } |
2244 | } |
| … | |
… | |
| 2450 | sub cf::client::send_msg { |
2515 | sub cf::client::send_msg { |
| 2451 | my ($self, $channel, $msg, $color, @extra) = @_; |
2516 | my ($self, $channel, $msg, $color, @extra) = @_; |
| 2452 | |
2517 | |
| 2453 | $msg = $self->pl->expand_cfpod ($msg); |
2518 | $msg = $self->pl->expand_cfpod ($msg); |
| 2454 | |
2519 | |
| 2455 | $color &= ~cf::NDI_UNIQUE; # just in case... |
2520 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
| 2456 | |
2521 | |
| 2457 | if (ref $channel) { |
2522 | if (ref $channel) { |
| 2458 | # send meta info to client, if not yet sent |
2523 | # send meta info to client, if not yet sent |
| 2459 | unless (exists $self->{channel}{$channel->{id}}) { |
2524 | unless (exists $self->{channel}{$channel->{id}}) { |
| 2460 | $self->{channel}{$channel->{id}} = $channel; |
2525 | $self->{channel}{$channel->{id}} = $channel; |
| 2461 | $self->ext_event (channel_info => %$channel); |
2526 | $self->ext_msg (channel_info => $channel); |
| 2462 | } |
2527 | } |
| 2463 | |
2528 | |
| 2464 | $channel = $channel->{id}; |
2529 | $channel = $channel->{id}; |
| 2465 | } |
2530 | } |
| 2466 | |
2531 | |
| 2467 | return unless @extra || length $msg; |
2532 | return unless @extra || length $msg; |
| 2468 | |
2533 | |
| 2469 | if ($self->can_msg) { |
2534 | if ($self->can_msg) { |
|
|
2535 | # default colour, mask it out |
|
|
2536 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
|
|
2537 | if $color & cf::NDI_DEF; |
|
|
2538 | |
| 2470 | $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); |
2539 | $self->send_packet ("msg " . $self->{json_coder}->encode ( |
|
|
2540 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); |
| 2471 | } else { |
2541 | } else { |
| 2472 | # replace some tags by gcfclient-compatible ones |
|
|
| 2473 | for ($msg) { |
|
|
| 2474 | 1 while |
|
|
| 2475 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
| 2476 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
| 2477 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
| 2478 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
| 2479 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
| 2480 | } |
|
|
| 2481 | |
|
|
| 2482 | if ($color >= 0) { |
2542 | if ($color >= 0) { |
|
|
2543 | # replace some tags by gcfclient-compatible ones |
|
|
2544 | for ($msg) { |
|
|
2545 | 1 while |
|
|
2546 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
2547 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
2548 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
2549 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
2550 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
2551 | } |
|
|
2552 | |
|
|
2553 | $color &= cf::NDI_COLOR_MASK; |
|
|
2554 | |
|
|
2555 | utf8::encode $msg; |
|
|
2556 | |
| 2483 | if (0 && $msg =~ /\[/) { |
2557 | if (0 && $msg =~ /\[/) { |
| 2484 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2558 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
| 2485 | } else { |
2559 | } else { |
| 2486 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2560 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
| 2487 | $self->send_packet ("drawinfo $color $msg") |
2561 | $self->send_packet ("drawinfo $color $msg") |
| 2488 | } |
2562 | } |
| 2489 | } |
2563 | } |
| 2490 | } |
2564 | } |
| 2491 | } |
2565 | } |
| 2492 | |
2566 | |
| 2493 | =item $client->ext_event ($type, %msg) |
2567 | =item $client->ext_msg ($type, @msg) |
| 2494 | |
2568 | |
| 2495 | Sends an ext event to the client. |
2569 | Sends an ext event to the client. |
| 2496 | |
2570 | |
| 2497 | =cut |
2571 | =cut |
| 2498 | |
2572 | |
| 2499 | sub cf::client::ext_event($$%) { |
2573 | sub cf::client::ext_msg($$@) { |
| 2500 | my ($self, $type, %msg) = @_; |
2574 | my ($self, $type, @msg) = @_; |
| 2501 | |
2575 | |
| 2502 | return unless $self->extcmd; |
2576 | my $extcmd = $self->extcmd; |
| 2503 | |
2577 | |
|
|
2578 | if ($extcmd == 2) { |
|
|
2579 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
|
|
2580 | } elsif ($extcmd == 1) { # TODO: remove |
| 2504 | $msg{msgtype} = "event_$type"; |
2581 | push @msg, msgtype => "event_$type"; |
| 2505 | $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); |
2582 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2583 | } |
| 2506 | } |
2584 | } |
| 2507 | |
2585 | |
| 2508 | =item $success = $client->query ($flags, "text", \&cb) |
2586 | =item $success = $client->query ($flags, "text", \&cb) |
| 2509 | |
2587 | |
| 2510 | Queues a query to the client, calling the given callback with |
2588 | Queues a query to the client, calling the given callback with |
| … | |
… | |
| 2565 | my ($ns, $buf) = @_; |
2643 | my ($ns, $buf) = @_; |
| 2566 | |
2644 | |
| 2567 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
2645 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
| 2568 | |
2646 | |
| 2569 | if (ref $msg) { |
2647 | if (ref $msg) { |
|
|
2648 | my ($type, $reply, @payload) = |
|
|
2649 | "ARRAY" eq ref $msg |
|
|
2650 | ? @$msg |
|
|
2651 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
|
|
2652 | |
| 2570 | if (my $cb = $EXTICMD{$msg->{msgtype}}) { |
2653 | if (my $cb = $EXTICMD{$type}) { |
| 2571 | if (my %reply = $cb->($ns, $msg)) { |
2654 | my @reply = $cb->($ns, @payload); |
| 2572 | $reply{msgid} = $msg->{msgid}; |
2655 | |
| 2573 | $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); |
2656 | $ns->ext_reply ($reply, @reply) |
| 2574 | } |
2657 | if $reply; |
| 2575 | } |
2658 | } |
| 2576 | } else { |
2659 | } else { |
| 2577 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2660 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
| 2578 | } |
2661 | } |
| 2579 | |
2662 | |
| … | |
… | |
| 2794 | # TODO: for gcfclient pleasure, we should give resources |
2877 | # TODO: for gcfclient pleasure, we should give resources |
| 2795 | # that gcfclient doesn't grok a >10000 face index. |
2878 | # that gcfclient doesn't grok a >10000 face index. |
| 2796 | my $res = $facedata->{resource}; |
2879 | my $res = $facedata->{resource}; |
| 2797 | my $enc = JSON::XS->new->utf8->canonical; |
2880 | my $enc = JSON::XS->new->utf8->canonical; |
| 2798 | |
2881 | |
|
|
2882 | my $soundconf = delete $res->{"res/sound.conf"}; |
|
|
2883 | |
| 2799 | while (my ($name, $info) = each %$res) { |
2884 | while (my ($name, $info) = each %$res) { |
| 2800 | my $meta = $enc->encode ({ |
2885 | my $meta = $enc->encode ({ |
| 2801 | name => $name, |
2886 | name => $name, |
| 2802 | type => $info->{type}, |
2887 | %{ $info->{meta} || {} }, |
| 2803 | copyright => $info->{copyright}, #TODO# |
|
|
| 2804 | }); |
2888 | }); |
| 2805 | |
2889 | |
| 2806 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
2890 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
| 2807 | |
2891 | |
| 2808 | if ($name =~ /\.jpg$/) { |
2892 | if ($info->{type} & 1) { |
| 2809 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack |
2893 | # prepend meta info |
| 2810 | cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack |
2894 | |
| 2811 | } else { |
|
|
| 2812 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
2895 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
| 2813 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
2896 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
| 2814 | |
2897 | |
| 2815 | cf::face::set_type $idx, 1; |
|
|
| 2816 | cf::face::set_data $idx, 0, $data, $chk; |
2898 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2899 | } else { |
|
|
2900 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
| 2817 | } |
2901 | } |
| 2818 | |
2902 | |
|
|
2903 | cf::face::set_type $idx, $info->{type}; |
|
|
2904 | |
| 2819 | cf::cede_to_tick; |
2905 | cf::cede_to_tick; |
| 2820 | } |
2906 | } |
|
|
2907 | |
|
|
2908 | if ($soundconf) { |
|
|
2909 | $soundconf = $enc->decode (delete $soundconf->{data}); |
|
|
2910 | |
|
|
2911 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
2912 | my $sound = $soundconf->{compat}[$_] |
|
|
2913 | or next; |
|
|
2914 | |
|
|
2915 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
2916 | cf::sound::set $sound->[0] => $face; |
|
|
2917 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
2918 | } |
|
|
2919 | |
|
|
2920 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
2921 | my $face = cf::face::find "sound/$v"; |
|
|
2922 | cf::sound::set $k => $face; |
|
|
2923 | } |
|
|
2924 | } |
| 2821 | } |
2925 | } |
| 2822 | |
2926 | |
| 2823 | 1 |
2927 | 1 |
| 2824 | } |
2928 | } |
|
|
2929 | |
|
|
2930 | register_exticmd fx_want => sub { |
|
|
2931 | my ($ns, $want) = @_; |
|
|
2932 | |
|
|
2933 | while (my ($k, $v) = each %$want) { |
|
|
2934 | $ns->fx_want ($k, $v); |
|
|
2935 | } |
|
|
2936 | }; |
| 2825 | |
2937 | |
| 2826 | sub reload_regions { |
2938 | sub reload_regions { |
| 2827 | load_resource_file "$MAPDIR/regions" |
2939 | load_resource_file "$MAPDIR/regions" |
| 2828 | or die "unable to load regions file\n"; |
2940 | or die "unable to load regions file\n"; |
| 2829 | |
2941 | |
