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.295 by root, Wed Jul 4 05:08:15 2007 UTC vs.
Revision 1.328 by root, Wed Aug 8 06:24:30 2007 UTC

… …
29use Fcntl; 29use Fcntl;
30use YAML::Syck (); 30use YAML::Syck ();
31use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
32use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
34 35
35# configure various modules to our taste 36# configure various modules to our taste
36# 37#
37$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
166 167
167These 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
168returns 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
169per 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.
170 177
171=back 178=back
172 179
173=cut 180=cut
174 181
… …
315 }; 322 };
316 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
317 $guard 324 $guard
318} 325}
319 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
320=item cf::async { BLOCK } 383=item cf::async { BLOCK }
321 384
322Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
323C<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
324thing you are allowed to do is call C<prio> on it. 387thing you are allowed to do is call C<prio> on it.
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
411 474
412=cut 475=cut
413 476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
414sub fork_call(&@) { 486sub fork_call(&@) {
415 my ($cb, @args) = @_; 487 my ($cb, @args) = @_;
416 488
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
418# or die "socketpair: $!"; 490# or die "socketpair: $!";
… …
421 493
422 if (my $pid = fork) { 494 if (my $pid = fork) {
423 close $fh2; 495 close $fh2;
424 496
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
426 $res = Coro::Storable::thaw $res; 499 $res = Coro::Storable::thaw $res;
427 500
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429 502
430 die $$res unless "ARRAY" eq ref $res; 503 Carp::confess $$res unless "ARRAY" eq ref $res;
431 504
432 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
433 } else { 506 } else {
434 reset_signals; 507 reset_signals;
435 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
436 local $SIG{__DIE__}; 509 local $SIG{__DIE__};
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
437 eval { 516 eval {
438 close $fh1; 517 close $fh1;
439 518
440 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
520
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
442 }; 523 };
443 524
444 warn $@ if $@; 525 warn $@ if $@;
445 _exit 0; 526 _exit 0;
446 } 527 }
… …
847 "; 928 ";
848 die if $@; 929 die if $@;
849} 930}
850 931
851our $override; 932our $override;
852our @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?
853 934
854sub override { 935sub override {
855 $override = 1; 936 $override = 1;
856 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
857} 938}
858 939
859sub do_invoke { 940sub do_invoke {
860 my $event = shift; 941 my $event = shift;
861 my $callbacks = shift; 942 my $callbacks = shift;
862 943
863 @invoke_results = (); 944 @INVOKE_RESULTS = ();
864 945
865 local $override; 946 local $override;
866 947
867 for (@$callbacks) { 948 for (@$callbacks) {
868 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
885 966
886Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
887 968
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 972
892=back 973=back
893 974
894=cut 975=cut
895 976
896############################################################################# 977#############################################################################
897# 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}
898 990
899sub reattach { 991sub reattach {
900 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 993 my ($obj) = @_;
902 994
… …
1089 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1090 1182
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1184
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1096 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1097 } 1195 if $reply;
1098 } 1196 }
1099 } else { 1197 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1199 }
1102 1200
… …
1425sub hintmode { 1523sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1; 1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode} 1525 $_[0]{hintmode}
1428} 1526}
1429 1527
1430=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1431 1529
1432Sends an ext reply to the player. 1530Sends an ext reply to the player.
1433 1531
1434=cut 1532=cut
1435 1533
1436sub ext_reply($$%) { 1534sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1438 1536
1439 $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;
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1441} 1544}
1442 1545
1443=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1444 1547
1445Sends an ext event to the client. 1548Sends an ext event to the client.
1446 1549
1447=cut 1550=cut
1448 1551
1449sub ext_event($$%) { 1552sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1451 1554
1452 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1453} 1556}
1454 1557
1455=head3 cf::region 1558=head3 cf::region
1456 1559
1457=over 4 1560=over 4
… …
1470 my ($path) = @_; 1573 my ($path) = @_;
1471 1574
1472 my ($match, $specificity); 1575 my ($match, $specificity);
1473 1576
1474 for my $region (list) { 1577 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1478 } 1581 }
1479 } 1582 }
1480 1583
… …
1600 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1601 return $self; 1704 return $self;
1602 } 1705 }
1603 } 1706 }
1604 1707
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1709 ()
1607} 1710}
1608 1711
1609sub init { 1712sub init {
1610 my ($self) = @_; 1713 my ($self) = @_;
… …
1818 $self->set_darkness_map; 1921 $self->set_darkness_map;
1819 Coro::cede; 1922 Coro::cede;
1820 $self->activate; 1923 $self->activate;
1821 } 1924 }
1822 1925
1926 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME);
1928
1823 $self->in_memory (cf::MAP_IN_MEMORY); 1929 $self->in_memory (cf::MAP_IN_MEMORY);
1824 } 1930 }
1825 1931
1826 $self->post_load; 1932 $self->post_load;
1827} 1933}
… …
1888 1994
1889 undef $MAP_PREFETCH{$path}; 1995 undef $MAP_PREFETCH{$path};
1890 $MAP_PREFETCHER ||= cf::async { 1996 $MAP_PREFETCHER ||= cf::async {
1891 while (%MAP_PREFETCH) { 1997 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 1998 for my $path (keys %MAP_PREFETCH) {
1893 my $map = find $path 1999 if (my $map = find $path) {
1894 or next;
1895 $map->load; 2000 $map->load;
2001 }
1896 2002
1897 delete $MAP_PREFETCH{$path}; 2003 delete $MAP_PREFETCH{$path};
1898 } 2004 }
1899 } 2005 }
1900 undef $MAP_PREFETCHER; 2006 undef $MAP_PREFETCHER;
… …
2127 2233
2128 } else { 2234 } else {
2129 my $pl = $self->contr; 2235 my $pl = $self->contr;
2130 2236
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2237 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2238 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2239 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2240
2140 } else { 2241 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2242 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2243 $self->message ($msg, $flags);
2143 } 2244 }
… …
2237 2338
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
2240} 2341}
2241 2342
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2344
2244Moves the player to the given map-path and coordinates by first freezing 2345Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback 2346her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on 2347that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position. 2348the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process.
2248 2350
2249=cut 2351=cut
2250 2352
2251our $GOTOGEN; 2353our $GOTOGEN;
2252 2354
2253sub cf::object::player::goto { 2355sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2357
2256 # do generation counting so two concurrent goto's will be executed in-order 2358 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2360
2259 $self->enter_link; 2361 $self->enter_link;
… …
2279 2381
2280 if ($gen == $self->{_goto_generation}) { 2382 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2383 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2283 } 2385 }
2386
2387 $done->() if $done;
2284 })->prio (1); 2388 })->prio (1);
2285} 2389}
2286 2390
2287=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
2288 2392
… …
2357 my $hp = $exit->stats->hp; 2461 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp; 2462 my $sp = $exit->stats->sp;
2359 2463
2360 $self->enter_link; 2464 $self->enter_link;
2361 2465
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2362 (async { 2470 (async {
2363 $self->deactivate_recursive; # just to be sure 2471 $self->deactivate_recursive; # just to be sure
2364 unless (eval { 2472 unless (eval {
2365 $self->goto ($slaying, $hp, $sp); 2473 $self->goto ($slaying, $hp, $sp);
2366 2474
… …
2393 2501
2394 utf8::encode $text; 2502 utf8::encode $text;
2395 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2396} 2504}
2397 2505
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2507
2400Send a drawinfo or msg packet to the client, formatting the msg for the 2508Send a drawinfo or msg packet to the client, formatting the msg for the
2401client if neccessary. C<$type> should be a string identifying the type of 2509client if neccessary. C<$type> should be a string identifying the type of
2402the message, with C<log> being the default. If C<$color> is negative, suppress 2510the message, with C<log> being the default. If C<$color> is negative, suppress
2403the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2404 2512
2405=cut 2513=cut
2406 2514
2407sub cf::client::send_msg { 2515sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2516 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2517
2410 $msg = $self->pl->expand_cfpod ($msg); 2518 $msg = $self->pl->expand_cfpod ($msg);
2411 2519
2520 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521
2522 if (ref $channel) {
2523 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel);
2527 }
2528
2529 $channel = $channel->{id};
2530 }
2531
2412 return unless @extra || length $msg; 2532 return unless @extra || length $msg;
2413 2533
2414 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
2415 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2539 $self->send_packet ("msg " . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2416 } else { 2541 } else {
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426
2427 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
2428 if (0 && $msg =~ /\[/) { 2557 if (0 && $msg =~ /\[/) {
2429 $self->send_packet ("drawextinfo $color 4 0 $msg") 2558 $self->send_packet ("drawextinfo $color 4 0 $msg")
2430 } else { 2559 } else {
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2560 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg") 2561 $self->send_packet ("drawinfo $color $msg")
2433 } 2562 }
2434 } 2563 }
2435 } 2564 }
2436} 2565}
2437 2566
2438=item $client->ext_event ($type, %msg) 2567=item $client->ext_msg ($type, @msg)
2439 2568
2440Sends an ext event to the client. 2569Sends an ext event to the client.
2441 2570
2442=cut 2571=cut
2443 2572
2444sub cf::client::ext_event($$%) { 2573sub cf::client::ext_msg($$@) {
2445 my ($self, $type, %msg) = @_; 2574 my ($self, $type, @msg) = @_;
2446 2575
2576 my $extcmd = $self->extcmd;
2577
2578 if ($extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2580 } elsif ($extcmd == 1) { # TODO: remove
2447 $msg{msgtype} = "event_$type"; 2581 push @msg, msgtype => "event_$type";
2448 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2582 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2583 }
2449} 2584}
2450 2585
2451=item $success = $client->query ($flags, "text", \&cb) 2586=item $success = $client->query ($flags, "text", \&cb)
2452 2587
2453Queues a query to the client, calling the given callback with 2588Queues a query to the client, calling the given callback with
… …
2508 my ($ns, $buf) = @_; 2643 my ($ns, $buf) = @_;
2509 2644
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2645 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511 2646
2512 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
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2653 if (my $cb = $EXTICMD{$type}) {
2514 if (my %reply = $cb->($ns, $msg)) { 2654 my @reply = $cb->($ns, @payload);
2515 $reply{msgid} = $msg->{msgid}; 2655
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2656 $ns->ext_reply ($reply, @reply)
2517 } 2657 if $reply;
2518 } 2658 }
2519 } else { 2659 } else {
2520 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";
2521 } 2661 }
2522 2662
… …
2570our $safe = new Safe "safe"; 2710our $safe = new Safe "safe";
2571our $safe_hole = new Safe::Hole; 2711our $safe_hole = new Safe::Hole;
2572 2712
2573$SIG{FPE} = 'IGNORE'; 2713$SIG{FPE} = 'IGNORE';
2574 2714
2575$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2715$safe->permit_only (Opcode::opset qw(
2716 :base_core :base_mem :base_orig :base_math
2717 grepstart grepwhile mapstart mapwhile
2718 sort time
2719));
2576 2720
2577# here we export the classes and methods available to script code 2721# here we export the classes and methods available to script code
2578 2722
2579=pod 2723=pod
2580 2724
2581The following functions and methods are available within a safe environment: 2725The following functions and methods are available within a safe environment:
2582 2726
2583 cf::object contr pay_amount pay_player map 2727 cf::object
2728 contr pay_amount pay_player map x y force_find force_add
2729 insert remove
2730
2584 cf::object::player player 2731 cf::object::player
2585 cf::player peaceful 2732 player
2586 cf::map trigger 2733
2734 cf::player
2735 peaceful
2736
2737 cf::map
2738 trigger
2587 2739
2588=cut 2740=cut
2589 2741
2590for ( 2742for (
2591 ["cf::object" => qw(contr pay_amount pay_player map)], 2743 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2744 insert remove inv)],
2592 ["cf::object::player" => qw(player)], 2745 ["cf::object::player" => qw(player)],
2593 ["cf::player" => qw(peaceful)], 2746 ["cf::player" => qw(peaceful)],
2594 ["cf::map" => qw(trigger)], 2747 ["cf::map" => qw(trigger)],
2595) { 2748) {
2596 no strict 'refs'; 2749 no strict 'refs';
… …
2688 { 2841 {
2689 my $faces = $facedata->{faceinfo}; 2842 my $faces = $facedata->{faceinfo};
2690 2843
2691 while (my ($face, $info) = each %$faces) { 2844 while (my ($face, $info) = each %$faces) {
2692 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2845 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2846 cf::face::set_visibility $idx, $info->{visibility};
2847 cf::face::set_magicmap $idx, $info->{magicmap};
2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2848 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2849 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2696 Coro::cede; 2850
2851 cf::cede_to_tick;
2697 } 2852 }
2698 2853
2699 while (my ($face, $info) = each %$faces) { 2854 while (my ($face, $info) = each %$faces) {
2700 next unless $info->{smooth}; 2855 next unless $info->{smooth};
2701 my $idx = cf::face::find $face 2856 my $idx = cf::face::find $face
2702 or next; 2857 or next;
2703 if (my $smooth = cf::face::find $info->{smooth}) { 2858 if (my $smooth = cf::face::find $info->{smooth}) {
2859 cf::face::set_smooth $idx, $smooth;
2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2860 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2705 } else { 2861 } else {
2706 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2862 warn "smooth face '$info->{smooth}' not found for face '$face'";
2707 } 2863 }
2708 Coro::cede; 2864
2865 cf::cede_to_tick;
2709 } 2866 }
2710 } 2867 }
2711 2868
2712 { 2869 {
2713 my $anims = $facedata->{animinfo}; 2870 my $anims = $facedata->{animinfo};
2714 2871
2715 while (my ($anim, $info) = each %$anims) { 2872 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2873 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede; 2874 cf::cede_to_tick;
2718 } 2875 }
2719 2876
2720 cf::anim::invalidate_all; # d'oh 2877 cf::anim::invalidate_all; # d'oh
2721 } 2878 }
2722 2879
2880 {
2881 # TODO: for gcfclient pleasure, we should give resources
2882 # that gcfclient doesn't grok a >10000 face index.
2883 my $res = $facedata->{resource};
2884 my $enc = JSON::XS->new->utf8->canonical;
2885
2886 my $soundconf = delete $res->{"res/sound.conf"};
2887
2888 while (my ($name, $info) = each %$res) {
2889 my $meta = $enc->encode ({
2890 name => $name,
2891 %{ $info->{meta} || {} },
2892 });
2893
2894 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2895
2896 if ($info->{type} & 1) {
2897 # prepend meta info
2898
2899 my $data = pack "(w/a*)*", $meta, $info->{data};
2900 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2901
2902 cf::face::set_data $idx, 0, $data, $chk;
2903 } else {
2904 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2905 }
2906
2907 cf::face::set_type $idx, $info->{type};
2908
2909 cf::cede_to_tick;
2910 }
2911
2912 if ($soundconf) {
2913 $soundconf = $enc->decode (delete $soundconf->{data});
2914
2915 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2916 my $sound = $soundconf->{compat}[$_]
2917 or next;
2918
2919 my $face = cf::face::find "sound/$sound->[1]";
2920 cf::sound::set $sound->[0] => $face;
2921 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2922 }
2923
2924 while (my ($k, $v) = each %{$soundconf->{event}}) {
2925 my $face = cf::face::find "sound/$v";
2926 cf::sound::set $k => $face;
2927 }
2928 }
2929 }
2930
2723 1 2931 1
2724} 2932}
2933
2934register_exticmd fx_want => sub {
2935 my ($ns, $want) = @_;
2936
2937 while (my ($k, $v) = each %$want) {
2938 $ns->fx_want ($k, $v);
2939 }
2940};
2725 2941
2726sub reload_regions { 2942sub reload_regions {
2727 load_resource_file "$MAPDIR/regions" 2943 load_resource_file "$MAPDIR/regions"
2728 or die "unable to load regions file\n"; 2944 or die "unable to load regions file\n";
2945
2946 for (cf::region::list) {
2947 $_->{match} = qr/$_->{match}/
2948 if exists $_->{match};
2949 }
2729} 2950}
2730 2951
2731sub reload_facedata { 2952sub reload_facedata {
2732 load_facedata "$DATADIR/facedata" 2953 load_facedata "$DATADIR/facedata"
2733 or die "unable to load facedata\n"; 2954 or die "unable to load facedata\n";

Diff Legend

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