ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.319 by root, Tue Jul 24 15:56:45 2007 UTC

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
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $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
371sub 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
329Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 386C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
918 974
919=cut 975=cut
920 976
921############################################################################# 977#############################################################################
922# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
923 990
924sub reattach { 991sub reattach {
925 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 993 my ($obj) = @_;
927 994
1114 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1115 1182
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1184
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1121 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1122 } 1195 if $reply;
1123 } 1196 }
1124 } else { 1197 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1199 }
1127 1200
1450sub hintmode { 1523sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1525 $_[0]{hintmode}
1453} 1526}
1454 1527
1455=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1456 1529
1457Sends an ext reply to the player. 1530Sends an ext reply to the player.
1458 1531
1459=cut 1532=cut
1460 1533
1461sub ext_reply($$%) { 1534sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1463 1536
1464 $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;
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1466} 1544}
1467 1545
1468=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1469 1547
1470Sends an ext event to the client. 1548Sends an ext event to the client.
1471 1549
1472=cut 1550=cut
1473 1551
1474sub ext_event($$%) { 1552sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1476 1554
1477 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1478} 1556}
1479 1557
1480=head3 cf::region 1558=head3 cf::region
1481 1559
1482=over 4 1560=over 4
2152 2230
2153 } else { 2231 } else {
2154 my $pl = $self->contr; 2232 my $pl = $self->contr;
2155 2233
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2234 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2235 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2237
2165 } else { 2238 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2239 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2240 $self->message ($msg, $flags);
2168 } 2241 }
2425 2498
2426 utf8::encode $text; 2499 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2500 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2428} 2501}
2429 2502
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2503=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2504
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2505Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of 2506client if neccessary. C<$type> should be a string identifying the type of
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2507the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2508the message unless the client supports the msg packet.
2436 2509
2437=cut 2510=cut
2438 2511
2439sub cf::client::send_msg { 2512sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2513 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2514
2442 $msg = $self->pl->expand_cfpod ($msg); 2515 $msg = $self->pl->expand_cfpod ($msg);
2443 2516
2517 $color &= ~cf::NDI_UNIQUE; # just in case...
2518
2519 if (ref $channel) {
2520 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel);
2524 }
2525
2526 $channel = $channel->{id};
2527 }
2528
2444 return unless @extra || length $msg; 2529 return unless @extra || length $msg;
2445 2530
2446 if ($self->can_msg) { 2531 if ($self->can_msg) {
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2448 } else { 2533 } else {
2449 # replace some tags by gcfclient-compatible ones 2534 # replace some tags by gcfclient-compatible ones
2450 for ($msg) { 2535 for ($msg) {
2451 1 while 2536 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 } 2550 }
2466 } 2551 }
2467 } 2552 }
2468} 2553}
2469 2554
2470=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2471 2556
2472Sends an ext event to the client. 2557Sends an ext event to the client.
2473 2558
2474=cut 2559=cut
2475 2560
2476sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2478 2563
2479 return unless $self->extcmd; 2564 my $extcmd = $self->extcmd;
2480 2565
2566 if ($extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2569 push @msg, msgtype => "event_$type";
2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 }
2483} 2572}
2484 2573
2485=item $success = $client->query ($flags, "text", \&cb) 2574=item $success = $client->query ($flags, "text", \&cb)
2486 2575
2487Queues a query to the client, calling the given callback with 2576Queues a query to the client, calling the given callback with
2542 my ($ns, $buf) = @_; 2631 my ($ns, $buf) = @_;
2543 2632
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2633 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 2634
2546 if (ref $msg) { 2635 if (ref $msg) {
2636 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg
2638 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2641 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 2642 my @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid}; 2643
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2644 $ns->ext_reply ($reply, @reply)
2551 } 2645 if $reply;
2552 } 2646 }
2553 } else { 2647 } else {
2554 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555 } 2649 }
2556 2650
2774 my $enc = JSON::XS->new->utf8->canonical; 2868 my $enc = JSON::XS->new->utf8->canonical;
2775 2869
2776 while (my ($name, $info) = each %$res) { 2870 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({ 2871 my $meta = $enc->encode ({
2778 name => $name, 2872 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO# 2873 copyright => $info->{copyright}, #TODO#
2781 }); 2874 });
2782 2875
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2876 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2784 2877
2785 if ($name =~ /\.jpg$/) { 2878 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2879 # prepend meta info
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2880
2788 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 2881 my $data = pack "(w/a*)*", $meta, $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791 2883
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk; 2884 cf::face::set_data $idx, 0, $data, $chk;
2885 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2794 } 2887 }
2795 2888
2889 cf::face::set_type $idx, $info->{type};
2890
2796 cf::cede_to_tick; 2891 cf::cede_to_tick;
2797 } 2892 }
2798 } 2893 }
2799 2894
2800 1 2895 1
2801} 2896}
2897
2898register_exticmd fx_want => sub {
2899 my ($ns, $want) = @_;
2900
2901 while (my ($k, $v) = each %$want) {
2902 $ns->fx_want ($k, $v);
2903 }
2904};
2802 2905
2803sub reload_regions { 2906sub reload_regions {
2804 load_resource_file "$MAPDIR/regions" 2907 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 2908 or die "unable to load regions file\n";
2806 2909

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines