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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.329 by root, Fri Aug 10 05:38:16 2007 UTC

… …
166=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
167 167
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 169returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
171 177
172=back 178=back
173 179
174=cut 180=cut
175 181
… …
316 }; 322 };
317 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
318 $guard 324 $guard
319} 325}
320 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
321=item cf::async { BLOCK } 383=item cf::async { BLOCK }
322 384
323Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
324C<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
325thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
… …
866 "; 928 ";
867 die if $@; 929 die if $@;
868} 930}
869 931
870our $override; 932our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 934
873sub override { 935sub override {
874 $override = 1; 936 $override = 1;
875 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
876} 938}
877 939
878sub do_invoke { 940sub do_invoke {
879 my $event = shift; 941 my $event = shift;
880 my $callbacks = shift; 942 my $callbacks = shift;
881 943
882 @invoke_results = (); 944 @INVOKE_RESULTS = ();
883 945
884 local $override; 946 local $override;
885 947
886 for (@$callbacks) { 948 for (@$callbacks) {
887 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
904 966
905Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
906 968
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 970removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 972
911=back 973=back
912 974
913=cut 975=cut
914 976
915############################################################################# 977#############################################################################
916# 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}
917 990
918sub reattach { 991sub reattach {
919 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 993 my ($obj) = @_;
921 994
… …
1108 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1109 1182
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1184
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1115 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1116 } 1195 if $reply;
1117 } 1196 }
1118 } else { 1197 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1199 }
1121 1200
… …
1291 $self->{deny_save} = 1; 1370 $self->{deny_save} = 1;
1292 1371
1293 $cf::PLAYER{$login} = $self; 1372 $cf::PLAYER{$login} = $self;
1294 1373
1295 $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 (@_);
1296} 1385}
1297 1386
1298=item $pl->quit_character 1387=item $pl->quit_character
1299 1388
1300Nukes the player without looking back. If logged in, the connection will 1389Nukes the player without looking back. If logged in, the connection will
… …
1444sub hintmode { 1533sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1535 $_[0]{hintmode}
1447} 1536}
1448 1537
1449=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1450 1539
1451Sends an ext reply to the player. 1540Sends an ext reply to the player.
1452 1541
1453=cut 1542=cut
1454 1543
1455sub ext_reply($$%) { 1544sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1457 1546
1458 $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;
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1460} 1554}
1461 1555
1462=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1463 1557
1464Sends an ext event to the client. 1558Sends an ext event to the client.
1465 1559
1466=cut 1560=cut
1467 1561
1468sub ext_event($$%) { 1562sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1470 1564
1471 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1472} 1566}
1473 1567
1474=head3 cf::region 1568=head3 cf::region
1475 1569
1476=over 4 1570=over 4
… …
1837 $self->set_darkness_map; 1931 $self->set_darkness_map;
1838 Coro::cede; 1932 Coro::cede;
1839 $self->activate; 1933 $self->activate;
1840 } 1934 }
1841 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1940 }
1844 1941
1845 $self->post_load; 1942 $self->post_load;
1846} 1943}
… …
2146 2243
2147 } else { 2244 } else {
2148 my $pl = $self->contr; 2245 my $pl = $self->contr;
2149 2246
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2248 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2250
2159 } else { 2251 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2162 } 2254 }
2163 } 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 (@_);
2164} 2266}
2165 2267
2166=item $player_object->may ("access") 2268=item $player_object->may ("access")
2167 2269
2168Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
… …
2419 2521
2420 utf8::encode $text; 2522 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2523 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2524}
2423 2525
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2526=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2527
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2528Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2529client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2530the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2531the message unless the client supports the msg packet.
2430 2532
2431=cut 2533=cut
2432 2534
2433sub cf::client::send_msg { 2535sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2536 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2537
2436 $msg = $self->pl->expand_cfpod ($msg); 2538 $msg = $self->pl->expand_cfpod ($msg);
2437 2539
2540 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541
2542 if (ref $channel) {
2543 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel);
2547 }
2548
2549 $channel = $channel->{id};
2550 }
2551
2438 return unless @extra || length $msg; 2552 return unless @extra || length $msg;
2439 2553
2440 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
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2559 $self->send_packet ("msg " . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2561 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 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
2454 if (0 && $msg =~ /\[/) { 2577 if (0 && $msg =~ /\[/) {
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 4 0 $msg")
2456 } else { 2579 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2459 } 2582 }
2460 } 2583 }
2461 } 2584 }
2462} 2585}
2463 2586
2464=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2465 2588
2466Sends an ext event to the client. 2589Sends an ext event to the client.
2467 2590
2468=cut 2591=cut
2469 2592
2470sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2472 2595
2473 return unless $self->extcmd; 2596 my $extcmd = $self->extcmd;
2474 2597
2598 if ($extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2601 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 }
2477} 2604}
2478 2605
2479=item $success = $client->query ($flags, "text", \&cb) 2606=item $success = $client->query ($flags, "text", \&cb)
2480 2607
2481Queues a query to the client, calling the given callback with 2608Queues a query to the client, calling the given callback with
… …
2536 my ($ns, $buf) = @_; 2663 my ($ns, $buf) = @_;
2537 2664
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2665 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2666
2540 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
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2673 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2674 my @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid}; 2675
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2676 $ns->ext_reply ($reply, @reply)
2545 } 2677 if $reply;
2546 } 2678 }
2547 } else { 2679 } else {
2548 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";
2549 } 2681 }
2550 2682
… …
2598our $safe = new Safe "safe"; 2730our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 2731our $safe_hole = new Safe::Hole;
2600 2732
2601$SIG{FPE} = 'IGNORE'; 2733$SIG{FPE} = 'IGNORE';
2602 2734
2603$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));
2604 2740
2605# here we export the classes and methods available to script code 2741# here we export the classes and methods available to script code
2606 2742
2607=pod 2743=pod
2608 2744
… …
2623 2759
2624=cut 2760=cut
2625 2761
2626for ( 2762for (
2627 ["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
2628 insert remove)], 2764 insert remove inv)],
2629 ["cf::object::player" => qw(player)], 2765 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 2766 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 2767 ["cf::map" => qw(trigger)],
2632) { 2768) {
2633 no strict 'refs'; 2769 no strict 'refs';
… …
2765 # TODO: for gcfclient pleasure, we should give resources 2901 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 2902 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 2903 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical; 2904 my $enc = JSON::XS->new->utf8->canonical;
2769 2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907
2770 while (my ($name, $info) = each %$res) { 2908 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 2909 my $meta = $enc->encode ({
2772 name => $name, 2910 name => $name,
2773 type => $info->{type}, 2911 %{ $info->{meta} || {} },
2774 copyright => $info->{copyright}, #TODO#
2775 }); 2912 });
2776 2913
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2914 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2778 2915
2779 if ($name =~ /\.jpg$/) { 2916 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2917 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2918
2782 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 2919 my $data = pack "(w/a*)*", $meta, $info->{data};
2784 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
2785 2921
2786 cf::face::set_type $idx, 1;
2787 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};
2788 } 2925 }
2789 2926
2927 cf::face::set_type $idx, $info->{type};
2928
2790 cf::cede_to_tick; 2929 cf::cede_to_tick;
2791 } 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 }
2792 } 2949 }
2793 2950
2794 1 2951 1
2795} 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};
2796 2961
2797sub reload_regions { 2962sub reload_regions {
2798 load_resource_file "$MAPDIR/regions" 2963 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 2964 or die "unable to load regions file\n";
2800 2965

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines