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.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.329 by root, Fri Aug 10 05:38:16 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
1308 $self->{deny_save} = 1; 1370 $self->{deny_save} = 1;
1309 1371
1310 $cf::PLAYER{$login} = $self; 1372 $cf::PLAYER{$login} = $self;
1311 1373
1312 $self 1374 $self
1375}
1376
1377=item $player->send_msg ($channel, $msg, $color, [extra...])
1378
1379=cut
1380
1381sub send_msg {
1382 my $ns = shift->ns
1383 or return;
1384 $ns->send_msg (@_);
1313} 1385}
1314 1386
1315=item $pl->quit_character 1387=item $pl->quit_character
1316 1388
1317Nukes the player without looking back. If logged in, the connection will 1389Nukes the player without looking back. If logged in, the connection will
1461sub hintmode { 1533sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1535 $_[0]{hintmode}
1464} 1536}
1465 1537
1466=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1467 1539
1468Sends an ext reply to the player. 1540Sends an ext reply to the player.
1469 1541
1470=cut 1542=cut
1471 1543
1472sub ext_reply($$%) { 1544sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1474 1546
1475 $msg{msgid} = $id; 1547 if ($self->ns->extcmd == 2) {
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1477} 1554}
1478 1555
1479=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1480 1557
1481Sends an ext event to the client. 1558Sends an ext event to the client.
1482 1559
1483=cut 1560=cut
1484 1561
1485sub ext_event($$%) { 1562sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1487 1564
1488 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1489} 1566}
1490 1567
1491=head3 cf::region 1568=head3 cf::region
1492 1569
1493=over 4 1570=over 4
1854 $self->set_darkness_map; 1931 $self->set_darkness_map;
1855 Coro::cede; 1932 Coro::cede;
1856 $self->activate; 1933 $self->activate;
1857 } 1934 }
1858 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1940 }
1861 1941
1862 $self->post_load; 1942 $self->post_load;
1863} 1943}
2163 2243
2164 } else { 2244 } else {
2165 my $pl = $self->contr; 2245 my $pl = $self->contr;
2166 2246
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2248 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2249 $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 2250
2176 } else { 2251 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2179 } 2254 }
2180 } 2255 }
2256}
2257
2258=item $object->send_msg ($channel, $msg, $color, [extra...])
2259
2260=cut
2261
2262sub cf::object::send_msg {
2263 my $pl = shift->contr
2264 or return;
2265 $pl->send_msg (@_);
2181} 2266}
2182 2267
2183=item $player_object->may ("access") 2268=item $player_object->may ("access")
2184 2269
2185Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
2450sub cf::client::send_msg { 2535sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2536 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2537
2453 $msg = $self->pl->expand_cfpod ($msg); 2538 $msg = $self->pl->expand_cfpod ($msg);
2454 2539
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case... 2540 $color &= cf::NDI_CLIENT_MASK; # just in case...
2458 2541
2459 if (ref $channel) { 2542 if (ref $channel) {
2460 # send meta info to client, if not yet sent 2543 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) { 2544 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel; 2545 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel); 2546 $self->ext_msg (channel_info => $channel);
2464 } 2547 }
2465 2548
2466 $channel = $channel->{id}; 2549 $channel = $channel->{id};
2467 } 2550 }
2468 2551
2552 return unless @extra || length $msg;
2553
2469 if ($self->can_msg) { 2554 if ($self->can_msg) {
2555 # default colour, mask it out
2556 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2557 if $color & cf::NDI_DEF;
2558
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2559 $self->send_packet ("msg " . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2561 } 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) { 2562 if ($color >= 0) {
2563 # replace some tags by gcfclient-compatible ones
2564 for ($msg) {
2565 1 while
2566 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2567 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2568 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2569 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2570 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2571 }
2572
2573 $color &= cf::NDI_COLOR_MASK;
2574
2575 utf8::encode $msg;
2576
2483 if (0 && $msg =~ /\[/) { 2577 if (0 && $msg =~ /\[/) {
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 4 0 $msg")
2485 } else { 2579 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2488 } 2582 }
2489 } 2583 }
2490 } 2584 }
2491} 2585}
2492 2586
2493=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2494 2588
2495Sends an ext event to the client. 2589Sends an ext event to the client.
2496 2590
2497=cut 2591=cut
2498 2592
2499sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2501 2595
2502 return unless $self->extcmd; 2596 my $extcmd = $self->extcmd;
2503 2597
2598 if ($extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2601 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 }
2506} 2604}
2507 2605
2508=item $success = $client->query ($flags, "text", \&cb) 2606=item $success = $client->query ($flags, "text", \&cb)
2509 2607
2510Queues a query to the client, calling the given callback with 2608Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2663 my ($ns, $buf) = @_;
2566 2664
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2665 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2666
2569 if (ref $msg) { 2667 if (ref $msg) {
2668 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg
2670 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2673 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2674 my @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid}; 2675
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2676 $ns->ext_reply ($reply, @reply)
2574 } 2677 if $reply;
2575 } 2678 }
2576 } else { 2679 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2681 }
2579 2682
2627our $safe = new Safe "safe"; 2730our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2731our $safe_hole = new Safe::Hole;
2629 2732
2630$SIG{FPE} = 'IGNORE'; 2733$SIG{FPE} = 'IGNORE';
2631 2734
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2735$safe->permit_only (Opcode::opset qw(
2736 :base_core :base_mem :base_orig :base_math
2737 grepstart grepwhile mapstart mapwhile
2738 sort time
2739));
2633 2740
2634# here we export the classes and methods available to script code 2741# here we export the classes and methods available to script code
2635 2742
2636=pod 2743=pod
2637 2744
2652 2759
2653=cut 2760=cut
2654 2761
2655for ( 2762for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)], 2764 insert remove inv)],
2658 ["cf::object::player" => qw(player)], 2765 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2766 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2767 ["cf::map" => qw(trigger)],
2661) { 2768) {
2662 no strict 'refs'; 2769 no strict 'refs';
2794 # TODO: for gcfclient pleasure, we should give resources 2901 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 2902 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 2903 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 2904 my $enc = JSON::XS->new->utf8->canonical;
2798 2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907
2799 while (my ($name, $info) = each %$res) { 2908 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({ 2909 my $meta = $enc->encode ({
2801 name => $name, 2910 name => $name,
2802 type => $info->{type}, 2911 %{ $info->{meta} || {} },
2803 copyright => $info->{copyright}, #TODO#
2804 }); 2912 });
2805 2913
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2914 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807 2915
2808 if ($name =~ /\.jpg$/) { 2916 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2917 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2918
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 2919 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814 2921
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk; 2922 cf::face::set_data $idx, 0, $data, $chk;
2923 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2817 } 2925 }
2818 2926
2927 cf::face::set_type $idx, $info->{type};
2928
2819 cf::cede_to_tick; 2929 cf::cede_to_tick;
2820 } 2930 }
2931
2932 if ($soundconf) {
2933 $soundconf = $enc->decode (delete $soundconf->{data});
2934
2935 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936 my $sound = $soundconf->{compat}[$_]
2937 or next;
2938
2939 my $face = cf::face::find "sound/$sound->[1]";
2940 cf::sound::set $sound->[0] => $face;
2941 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2942 }
2943
2944 while (my ($k, $v) = each %{$soundconf->{event}}) {
2945 my $face = cf::face::find "sound/$v";
2946 cf::sound::set $k => $face;
2947 }
2948 }
2821 } 2949 }
2822 2950
2823 1 2951 1
2824} 2952}
2953
2954register_exticmd fx_want => sub {
2955 my ($ns, $want) = @_;
2956
2957 while (my ($k, $v) = each %$want) {
2958 $ns->fx_want ($k, $v);
2959 }
2960};
2825 2961
2826sub reload_regions { 2962sub reload_regions {
2827 load_resource_file "$MAPDIR/regions" 2963 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 2964 or die "unable to load regions file\n";
2829 2965

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines