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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.331 by root, Mon Aug 13 13:10:01 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: $!";
… …
433 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
434 } else { 506 } else {
435 reset_signals; 507 reset_signals;
436 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
437 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.
438 local $Coro::idle; 513 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX); 514 $Coro::current->prio (Coro::PRIO_MAX);
515
440 eval { 516 eval {
441 close $fh1; 517 close $fh1;
442 518
443 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
444 520
445 open my $fh, ">", \my $buf 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2; 522 close $fh2;
455 }; 523 };
456 524
457 warn $@ if $@; 525 warn $@ if $@;
458 _exit 0; 526 _exit 0;
… …
860 "; 928 ";
861 die if $@; 929 die if $@;
862} 930}
863 931
864our $override; 932our $override;
865our @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?
866 934
867sub override { 935sub override {
868 $override = 1; 936 $override = 1;
869 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
870} 938}
871 939
872sub do_invoke { 940sub do_invoke {
873 my $event = shift; 941 my $event = shift;
874 my $callbacks = shift; 942 my $callbacks = shift;
875 943
876 @invoke_results = (); 944 @INVOKE_RESULTS = ();
877 945
878 local $override; 946 local $override;
879 947
880 for (@$callbacks) { 948 for (@$callbacks) {
881 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
898 966
899Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
900 968
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 972
905=back 973=back
906 974
907=cut 975=cut
908 976
909############################################################################# 977#############################################################################
910# 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}
911 990
912sub reattach { 991sub reattach {
913 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 993 my ($obj) = @_;
915 994
… …
1102 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1103 1182
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1184
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1109 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1110 } 1195 if $reply;
1111 } 1196 }
1112 } else { 1197 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1199 }
1115 1200
… …
1285 $self->{deny_save} = 1; 1370 $self->{deny_save} = 1;
1286 1371
1287 $cf::PLAYER{$login} = $self; 1372 $cf::PLAYER{$login} = $self;
1288 1373
1289 $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 (@_);
1290} 1385}
1291 1386
1292=item $pl->quit_character 1387=item $pl->quit_character
1293 1388
1294Nukes the player without looking back. If logged in, the connection will 1389Nukes the player without looking back. If logged in, the connection will
… …
1438sub hintmode { 1533sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1535 $_[0]{hintmode}
1441} 1536}
1442 1537
1443=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1444 1539
1445Sends an ext reply to the player. 1540Sends an ext reply to the player.
1446 1541
1447=cut 1542=cut
1448 1543
1449sub ext_reply($$%) { 1544sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1451 1546
1452 $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;
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1454} 1554}
1455 1555
1456=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1457 1557
1458Sends an ext event to the client. 1558Sends an ext event to the client.
1459 1559
1460=cut 1560=cut
1461 1561
1462sub ext_event($$%) { 1562sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1464 1564
1465 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1466} 1566}
1467 1567
1468=head3 cf::region 1568=head3 cf::region
1469 1569
1470=over 4 1570=over 4
… …
1483 my ($path) = @_; 1583 my ($path) = @_;
1484 1584
1485 my ($match, $specificity); 1585 my ($match, $specificity);
1486 1586
1487 for my $region (list) { 1587 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1588 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1589 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1590 if $region->specificity > $specificity;
1491 } 1591 }
1492 } 1592 }
1493 1593
… …
1613 $self->init; # pass $1 etc. 1713 $self->init; # pass $1 etc.
1614 return $self; 1714 return $self;
1615 } 1715 }
1616 } 1716 }
1617 1717
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1718 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1719 ()
1620} 1720}
1621 1721
1622sub init { 1722sub init {
1623 my ($self) = @_; 1723 my ($self) = @_;
… …
1831 $self->set_darkness_map; 1931 $self->set_darkness_map;
1832 Coro::cede; 1932 Coro::cede;
1833 $self->activate; 1933 $self->activate;
1834 } 1934 }
1835 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1940 }
1838 1941
1839 $self->post_load; 1942 $self->post_load;
1840} 1943}
… …
1901 2004
1902 undef $MAP_PREFETCH{$path}; 2005 undef $MAP_PREFETCH{$path};
1903 $MAP_PREFETCHER ||= cf::async { 2006 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 2007 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2008 for my $path (keys %MAP_PREFETCH) {
1906 my $map = find $path 2009 if (my $map = find $path) {
1907 or next;
1908 $map->load; 2010 $map->load;
2011 }
1909 2012
1910 delete $MAP_PREFETCH{$path}; 2013 delete $MAP_PREFETCH{$path};
1911 } 2014 }
1912 } 2015 }
1913 undef $MAP_PREFETCHER; 2016 undef $MAP_PREFETCHER;
… …
2140 2243
2141 } else { 2244 } else {
2142 my $pl = $self->contr; 2245 my $pl = $self->contr;
2143 2246
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2248 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2250
2153 } else { 2251 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2156 } 2254 }
2157 } 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 (@_);
2158} 2266}
2159 2267
2160=item $player_object->may ("access") 2268=item $player_object->may ("access")
2161 2269
2162Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
… …
2250 2358
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2360 $self->enter_map ($map, $x, $y);
2253} 2361}
2254 2362
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2363=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2364
2257Moves the player to the given map-path and coordinates by first freezing 2365Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2366her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2367that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2368the new (success) or old (failed) map position. In either case, $done will
2369be called at the end of this process.
2261 2370
2262=cut 2371=cut
2263 2372
2264our $GOTOGEN; 2373our $GOTOGEN;
2265 2374
2266sub cf::object::player::goto { 2375sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2376 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2377
2269 # do generation counting so two concurrent goto's will be executed in-order 2378 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2380
2272 $self->enter_link; 2381 $self->enter_link;
… …
2292 2401
2293 if ($gen == $self->{_goto_generation}) { 2402 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2403 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2404 $self->leave_link ($map, $x, $y);
2296 } 2405 }
2406
2407 $done->() if $done;
2297 })->prio (1); 2408 })->prio (1);
2298} 2409}
2299 2410
2300=item $player_object->enter_exit ($exit_object) 2411=item $player_object->enter_exit ($exit_object)
2301 2412
… …
2410 2521
2411 utf8::encode $text; 2522 utf8::encode $text;
2412 $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);
2413} 2524}
2414 2525
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2526=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2527
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2531the message unless the client supports the msg packet.
2421 2532
2422=cut 2533=cut
2423 2534
2424sub cf::client::send_msg { 2535sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2536 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2537
2427 $msg = $self->pl->expand_cfpod ($msg); 2538 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2552 return unless @extra || length $msg;
2430 2553
2431 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
2432 $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]));
2433 } else { 2561 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 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
2445 if (0 && $msg =~ /\[/) { 2577 if (0 && $msg =~ /\[/) {
2578 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2579 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2580 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2581 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2582 $self->send_packet ("drawinfo $color $msg")
2450 } 2583 }
2451 } 2584 }
2452 } 2585 }
2453} 2586}
2454 2587
2455=item $client->ext_event ($type, %msg) 2588=item $client->ext_msg ($type, @msg)
2456 2589
2457Sends an ext event to the client. 2590Sends an ext event to the client.
2458 2591
2459=cut 2592=cut
2460 2593
2461sub cf::client::ext_event($$%) { 2594sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2595 my ($self, $type, @msg) = @_;
2463 2596
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2602 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 }
2466} 2605}
2467 2606
2468=item $success = $client->query ($flags, "text", \&cb) 2607=item $success = $client->query ($flags, "text", \&cb)
2469 2608
2470Queues a query to the client, calling the given callback with 2609Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2664 my ($ns, $buf) = @_;
2526 2665
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2666 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2667
2529 if (ref $msg) { 2668 if (ref $msg) {
2669 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg
2671 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2674 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2675 my @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid}; 2676
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2677 $ns->ext_reply ($reply, @reply)
2534 } 2678 if $reply;
2535 } 2679 }
2536 } else { 2680 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2682 }
2539 2683
… …
2587our $safe = new Safe "safe"; 2731our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2732our $safe_hole = new Safe::Hole;
2589 2733
2590$SIG{FPE} = 'IGNORE'; 2734$SIG{FPE} = 'IGNORE';
2591 2735
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2736$safe->permit_only (Opcode::opset qw(
2737 :base_core :base_mem :base_orig :base_math
2738 grepstart grepwhile mapstart mapwhile
2739 sort time
2740));
2593 2741
2594# here we export the classes and methods available to script code 2742# here we export the classes and methods available to script code
2595 2743
2596=pod 2744=pod
2597 2745
2598The following functions and methods are available within a safe environment: 2746The following functions and methods are available within a safe environment:
2599 2747
2600 cf::object 2748 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2749 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2750 insert remove name archname title slaying race
2603 2751
2604 cf::object::player 2752 cf::object::player
2605 player 2753 player
2606 2754
2607 cf::player 2755 cf::player
… …
2612 2760
2613=cut 2761=cut
2614 2762
2615for ( 2763for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)], 2765 insert remove inv name archname title slaying race)],
2618 ["cf::object::player" => qw(player)], 2766 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2767 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2768 ["cf::map" => qw(trigger)],
2621) { 2769) {
2622 no strict 'refs'; 2770 no strict 'refs';
… …
2714 { 2862 {
2715 my $faces = $facedata->{faceinfo}; 2863 my $faces = $facedata->{faceinfo};
2716 2864
2717 while (my ($face, $info) = each %$faces) { 2865 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2866 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2867 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2722 Coro::cede; 2871
2872 cf::cede_to_tick;
2723 } 2873 }
2724 2874
2725 while (my ($face, $info) = each %$faces) { 2875 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2876 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2877 my $idx = cf::face::find $face
2728 or next; 2878 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2879 if (my $smooth = cf::face::find $info->{smooth}) {
2880 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2881 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2882 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2883 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2884 }
2734 Coro::cede; 2885
2886 cf::cede_to_tick;
2735 } 2887 }
2736 } 2888 }
2737 2889
2738 { 2890 {
2739 my $anims = $facedata->{animinfo}; 2891 my $anims = $facedata->{animinfo};
2740 2892
2741 while (my ($anim, $info) = each %$anims) { 2893 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2894 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2895 cf::cede_to_tick;
2744 } 2896 }
2745 2897
2746 cf::anim::invalidate_all; # d'oh 2898 cf::anim::invalidate_all; # d'oh
2747 } 2899 }
2748 2900
2901 {
2902 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906
2907 my $soundconf = delete $res->{"res/sound.conf"};
2908
2909 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2916
2917 if ($info->{type} & 1) {
2918 # prepend meta info
2919
2920 my $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2926 }
2927
2928 cf::face::set_type $idx, $info->{type};
2929
2930 cf::cede_to_tick;
2931 }
2932
2933 if ($soundconf) {
2934 $soundconf = $enc->decode (delete $soundconf->{data});
2935
2936 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2937 my $sound = $soundconf->{compat}[$_]
2938 or next;
2939
2940 my $face = cf::face::find "sound/$sound->[1]";
2941 cf::sound::set $sound->[0] => $face;
2942 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2943 }
2944
2945 while (my ($k, $v) = each %{$soundconf->{event}}) {
2946 my $face = cf::face::find "sound/$v";
2947 cf::sound::set $k => $face;
2948 }
2949 }
2950 }
2951
2749 1 2952 1
2750} 2953}
2954
2955register_exticmd fx_want => sub {
2956 my ($ns, $want) = @_;
2957
2958 while (my ($k, $v) = each %$want) {
2959 $ns->fx_want ($k, $v);
2960 }
2961};
2751 2962
2752sub reload_regions { 2963sub reload_regions {
2753 load_resource_file "$MAPDIR/regions" 2964 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2965 or die "unable to load regions file\n";
2966
2967 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/
2969 if exists $_->{match};
2970 }
2755} 2971}
2756 2972
2757sub reload_facedata { 2973sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 2974 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 2975 or die "unable to load facedata\n";

Diff Legend

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