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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.321 by root, Thu Jul 26 21:44:43 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.
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
1461sub hintmode { 1523sub 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
1468Sends an ext reply to the player. 1530Sends an ext reply to the player.
1469 1531
1470=cut 1532=cut
1471 1533
1472sub ext_reply($$%) { 1534sub 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
1481Sends an ext event to the client. 1548Sends an ext event to the client.
1482 1549
1483=cut 1550=cut
1484 1551
1485sub ext_event($$%) { 1552sub 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
2163 2230
2164 } else { 2231 } else {
2165 my $pl = $self->contr; 2232 my $pl = $self->contr;
2166 2233
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2234 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2235 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2236 $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 2237
2176 } else { 2238 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2239 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2240 $self->message ($msg, $flags);
2179 } 2241 }
2456 2518
2457 if (ref $channel) { 2519 if (ref $channel) {
2458 # send meta info to client, if not yet sent 2520 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2521 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2522 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2523 $self->ext_msg (channel_info => $channel);
2462 } 2524 }
2463 2525
2464 $channel = $channel->{id}; 2526 $channel = $channel->{id};
2465 } 2527 }
2466 2528
2488 } 2550 }
2489 } 2551 }
2490 } 2552 }
2491} 2553}
2492 2554
2493=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2494 2556
2495Sends an ext event to the client. 2557Sends an ext event to the client.
2496 2558
2497=cut 2559=cut
2498 2560
2499sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2501 2563
2502 return unless $self->extcmd; 2564 my $extcmd = $self->extcmd;
2503 2565
2566 if ($extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2569 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 }
2506} 2572}
2507 2573
2508=item $success = $client->query ($flags, "text", \&cb) 2574=item $success = $client->query ($flags, "text", \&cb)
2509 2575
2510Queues a query to the client, calling the given callback with 2576Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2631 my ($ns, $buf) = @_;
2566 2632
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2633 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2634
2569 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
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2641 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2642 my @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid}; 2643
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2644 $ns->ext_reply ($reply, @reply)
2574 } 2645 if $reply;
2575 } 2646 }
2576 } else { 2647 } else {
2577 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";
2578 } 2649 }
2579 2650
2794 # TODO: for gcfclient pleasure, we should give resources 2865 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 2866 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 2867 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 2868 my $enc = JSON::XS->new->utf8->canonical;
2798 2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871
2799 while (my ($name, $info) = each %$res) { 2872 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({ 2873 my $meta = $enc->encode ({
2801 name => $name, 2874 name => $name,
2802 type => $info->{type}, 2875 %{ $info->{meta} || {} },
2803 copyright => $info->{copyright}, #TODO#
2804 }); 2876 });
2805 2877
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2878 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807 2879
2808 if ($name =~ /\.jpg$/) { 2880 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2881 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2882
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814 2885
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk; 2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2817 } 2889 }
2818 2890
2891 cf::face::set_type $idx, $info->{type};
2892
2819 cf::cede_to_tick; 2893 cf::cede_to_tick;
2820 } 2894 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 warn "$sound->[0]: $face\n";#d#
2905
2906 cf::sound::set $sound->[0] => $face;
2907 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2908 }
2909
2910 #TODO
2911 }
2821 } 2912 }
2822 2913
2823 1 2914 1
2824} 2915}
2916
2917register_exticmd fx_want => sub {
2918 my ($ns, $want) = @_;
2919
2920 while (my ($k, $v) = each %$want) {
2921 $ns->fx_want ($k, $v);
2922 }
2923};
2825 2924
2826sub reload_regions { 2925sub reload_regions {
2827 load_resource_file "$MAPDIR/regions" 2926 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 2927 or die "unable to load regions file\n";
2829 2928

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines