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.288 by root, Mon Jun 25 07:40:53 2007 UTC vs.
Revision 1.323 by root, Sat Jul 28 12:02:58 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
… …
248 255
249Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
250 257
251=cut 258=cut
252 259
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 261
255sub to_json ($) { $json_coder->encode ($_[0]) } 262sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 263sub from_json ($) { $json_coder->decode ($_[0]) }
257 264
258=item cf::lock_wait $string 265=item cf::lock_wait $string
… …
313 my $guard = Coro::guard { 320 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 321 $TICK_WATCHER->start;
315 }; 322 };
316 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
317 $guard 324 $guard
325}
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;
318} 381}
319 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
… …
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
… …
1086 cf::override; 1178 cf::override;
1087 }, 1179 },
1088 on_extcmd => sub { 1180 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1090 1182
1091 my $msg = eval { from_json $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
… …
1400 # replace G<male|female> tags 1498 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1403 }ge 1501 }ge
1404 # replace H<hint text> 1502 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1406 1510
1407 # create single paragraphs (very hackish) 1511 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1512 s/(?<=\S)\n(?=\w)/ /g;
1409 1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1410 $_ 1520 $_
1411} 1521}
1412 1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1413=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1414 1529
1415Sends an ext reply to the player. 1530Sends an ext reply to the player.
1416 1531
1417=cut 1532=cut
1418 1533
1419sub ext_reply($$%) { 1534sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1421 1536
1422 $msg{msgid} = $id; 1537 if ($self->ns->extcmd == 2) {
1423 $self->send ("ext " . cf::to_json \%msg); 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;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1424} 1544}
1425 1545
1426=item $player->ext_event ($type, %msg) 1546=item $player->ext_msg ($type, @msg)
1427 1547
1428Sends an ext event to the client. 1548Sends an ext event to the client.
1429 1549
1430=cut 1550=cut
1431 1551
1432sub ext_event($$%) { 1552sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1553 my ($self, $type, @msg) = @_;
1434 1554
1435 $self->ns->ext_event ($type, %msg); 1555 $self->ns->ext_msg ($type, @msg);
1436} 1556}
1437 1557
1438=head3 cf::region 1558=head3 cf::region
1439 1559
1440=over 4 1560=over 4
… …
1453 my ($path) = @_; 1573 my ($path) = @_;
1454 1574
1455 my ($match, $specificity); 1575 my ($match, $specificity);
1456 1576
1457 for my $region (list) { 1577 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1578 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1579 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1580 if $region->specificity > $specificity;
1461 } 1581 }
1462 } 1582 }
1463 1583
… …
1583 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1584 return $self; 1704 return $self;
1585 } 1705 }
1586 } 1706 }
1587 1707
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1709 ()
1590} 1710}
1591 1711
1592sub init { 1712sub init {
1593 my ($self) = @_; 1713 my ($self) = @_;
… …
1871 1991
1872 undef $MAP_PREFETCH{$path}; 1992 undef $MAP_PREFETCH{$path};
1873 $MAP_PREFETCHER ||= cf::async { 1993 $MAP_PREFETCHER ||= cf::async {
1874 while (%MAP_PREFETCH) { 1994 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 1995 for my $path (keys %MAP_PREFETCH) {
1876 my $map = find $path 1996 if (my $map = find $path) {
1877 or next;
1878 $map->load; 1997 $map->load;
1998 }
1879 1999
1880 delete $MAP_PREFETCH{$path}; 2000 delete $MAP_PREFETCH{$path};
1881 } 2001 }
1882 } 2002 }
1883 undef $MAP_PREFETCHER; 2003 undef $MAP_PREFETCHER;
… …
2110 2230
2111 } else { 2231 } else {
2112 my $pl = $self->contr; 2232 my $pl = $self->contr;
2113 2233
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2234 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2235 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2237
2123 } else { 2238 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2239 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2240 $self->message ($msg, $flags);
2126 } 2241 }
… …
2220 2335
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2337 $self->enter_map ($map, $x, $y);
2223} 2338}
2224 2339
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2340=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2341
2227Moves the player to the given map-path and coordinates by first freezing 2342Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2343her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2344that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2345the new (success) or old (failed) map position. In either case, $done will
2346be called at the end of this process.
2231 2347
2232=cut 2348=cut
2233 2349
2234our $GOTOGEN; 2350our $GOTOGEN;
2235 2351
2236sub cf::object::player::goto { 2352sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2353 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2354
2239 # do generation counting so two concurrent goto's will be executed in-order 2355 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2357
2242 $self->enter_link; 2358 $self->enter_link;
… …
2262 2378
2263 if ($gen == $self->{_goto_generation}) { 2379 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2380 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2381 $self->leave_link ($map, $x, $y);
2266 } 2382 }
2383
2384 $done->() if $done;
2267 })->prio (1); 2385 })->prio (1);
2268} 2386}
2269 2387
2270=item $player_object->enter_exit ($exit_object) 2388=item $player_object->enter_exit ($exit_object)
2271 2389
… …
2340 my $hp = $exit->stats->hp; 2458 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2459 my $sp = $exit->stats->sp;
2342 2460
2343 $self->enter_link; 2461 $self->enter_link;
2344 2462
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2345 (async { 2467 (async {
2346 $self->deactivate_recursive; # just to be sure 2468 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2469 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2470 $self->goto ($slaying, $hp, $sp);
2349 2471
… …
2376 2498
2377 utf8::encode $text; 2499 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2500 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2501}
2380 2502
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2503=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2504
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2505Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2506client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2507the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2508the message unless the client supports the msg packet.
2387 2509
2388=cut 2510=cut
2389 2511
2390sub cf::client::send_msg { 2512sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2513 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2514
2393 $msg = $self->pl->expand_cfpod ($msg); 2515 $msg = $self->pl->expand_cfpod ($msg);
2394 2516
2517 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518
2519 if (ref $channel) {
2520 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel);
2524 }
2525
2526 $channel = $channel->{id};
2527 }
2528
2529 return unless @extra || length $msg;
2530
2395 if ($self->can_msg) { 2531 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2532 # default colour, mask it out
2533 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2534 if $color & cf::NDI_DEF;
2535
2536 $self->send_packet ("msg " . $self->{json_coder}->encode (
2537 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2397 } else { 2538 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) { 2539 if ($color >= 0) {
2540 # replace some tags by gcfclient-compatible ones
2541 for ($msg) {
2542 1 while
2543 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2544 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2545 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2546 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 }
2549
2550 $color &= cf::NDI_COLOR_MASK;
2551
2409 if (0 && $msg =~ /\[/) { 2552 if (0 && $msg =~ /\[/) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2553 $self->send_packet ("drawextinfo $color 4 0 $msg")
2411 } else { 2554 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2556 $self->send_packet ("drawinfo $color $msg")
2414 } 2557 }
2415 } 2558 }
2416 } 2559 }
2417} 2560}
2418 2561
2419=item $client->ext_event ($type, %msg) 2562=item $client->ext_msg ($type, @msg)
2420 2563
2421Sends an ext event to the client. 2564Sends an ext event to the client.
2422 2565
2423=cut 2566=cut
2424 2567
2425sub cf::client::ext_event($$%) { 2568sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2569 my ($self, $type, @msg) = @_;
2427 2570
2571 my $extcmd = $self->extcmd;
2572
2573 if ($extcmd == 2) {
2574 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2575 } elsif ($extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2576 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg); 2577 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2578 }
2430} 2579}
2431 2580
2432=item $success = $client->query ($flags, "text", \&cb) 2581=item $success = $client->query ($flags, "text", \&cb)
2433 2582
2434Queues a query to the client, calling the given callback with 2583Queues a query to the client, calling the given callback with
… …
2457 2606
2458 1 2607 1
2459} 2608}
2460 2609
2461cf::client->attach ( 2610cf::client->attach (
2611 on_connect => sub {
2612 my ($ns) = @_;
2613
2614 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2615 },
2462 on_reply => sub { 2616 on_reply => sub {
2463 my ($ns, $msg) = @_; 2617 my ($ns, $msg) = @_;
2464 2618
2465 # this weird shuffling is so that direct followup queries 2619 # this weird shuffling is so that direct followup queries
2466 # get handled first 2620 # get handled first
… …
2481 } 2635 }
2482 }, 2636 },
2483 on_exticmd => sub { 2637 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2638 my ($ns, $buf) = @_;
2485 2639
2486 my $msg = eval { from_json $buf }; 2640 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2641
2488 if (ref $msg) { 2642 if (ref $msg) {
2643 my ($type, $reply, @payload) =
2644 "ARRAY" eq ref $msg
2645 ? @$msg
2646 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2647
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2648 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2649 my @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid}; 2650
2492 $ns->send ("ext " . cf::to_json \%reply); 2651 $ns->ext_reply ($reply, @reply)
2493 } 2652 if $reply;
2494 } 2653 }
2495 } else { 2654 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2655 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 } 2656 }
2498 2657
… …
2554 2713
2555=pod 2714=pod
2556 2715
2557The following functions and methods are available within a safe environment: 2716The following functions and methods are available within a safe environment:
2558 2717
2559 cf::object contr pay_amount pay_player map 2718 cf::object
2719 contr pay_amount pay_player map x y force_find force_add
2720 insert remove
2721
2560 cf::object::player player 2722 cf::object::player
2561 cf::player peaceful 2723 player
2562 cf::map trigger 2724
2725 cf::player
2726 peaceful
2727
2728 cf::map
2729 trigger
2563 2730
2564=cut 2731=cut
2565 2732
2566for ( 2733for (
2567 ["cf::object" => qw(contr pay_amount pay_player map)], 2734 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2735 insert remove)],
2568 ["cf::object::player" => qw(player)], 2736 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 2737 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 2738 ["cf::map" => qw(trigger)],
2571) { 2739) {
2572 no strict 'refs'; 2740 no strict 'refs';
… …
2664 { 2832 {
2665 my $faces = $facedata->{faceinfo}; 2833 my $faces = $facedata->{faceinfo};
2666 2834
2667 while (my ($face, $info) = each %$faces) { 2835 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2836 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2837 cf::face::set_visibility $idx, $info->{visibility};
2838 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2839 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2840 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2672 Coro::cede; 2841
2842 cf::cede_to_tick;
2673 } 2843 }
2674 2844
2675 while (my ($face, $info) = each %$faces) { 2845 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 2846 next unless $info->{smooth};
2677 my $idx = cf::face::find $face 2847 my $idx = cf::face::find $face
2678 or next; 2848 or next;
2679 if (my $smooth = cf::face::find $info->{smooth}) { 2849 if (my $smooth = cf::face::find $info->{smooth}) {
2850 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2851 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 2852 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2853 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 2854 }
2684 Coro::cede; 2855
2856 cf::cede_to_tick;
2685 } 2857 }
2686 } 2858 }
2687 2859
2688 { 2860 {
2689 my $anims = $facedata->{animinfo}; 2861 my $anims = $facedata->{animinfo};
2690 2862
2691 while (my ($anim, $info) = each %$anims) { 2863 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2864 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 2865 cf::cede_to_tick;
2694 } 2866 }
2695 2867
2696 cf::anim::invalidate_all; # d'oh 2868 cf::anim::invalidate_all; # d'oh
2697 } 2869 }
2698 2870
2871 {
2872 # TODO: for gcfclient pleasure, we should give resources
2873 # that gcfclient doesn't grok a >10000 face index.
2874 my $res = $facedata->{resource};
2875 my $enc = JSON::XS->new->utf8->canonical;
2876
2877 my $soundconf = delete $res->{"res/sound.conf"};
2878
2879 while (my ($name, $info) = each %$res) {
2880 my $meta = $enc->encode ({
2881 name => $name,
2882 %{ $info->{meta} || {} },
2883 });
2884
2885 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2886
2887 if ($info->{type} & 1) {
2888 # prepend meta info
2889
2890 my $data = pack "(w/a*)*", $meta, $info->{data};
2891 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2892
2893 cf::face::set_data $idx, 0, $data, $chk;
2894 } else {
2895 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2896 }
2897
2898 cf::face::set_type $idx, $info->{type};
2899
2900 cf::cede_to_tick;
2901 }
2902
2903 if ($soundconf) {
2904 $soundconf = $enc->decode (delete $soundconf->{data});
2905
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_]
2908 or next;
2909
2910 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 }
2915
2916 #TODO
2917 }
2918 }
2919
2699 1 2920 1
2700} 2921}
2922
2923register_exticmd fx_want => sub {
2924 my ($ns, $want) = @_;
2925
2926 while (my ($k, $v) = each %$want) {
2927 $ns->fx_want ($k, $v);
2928 }
2929};
2701 2930
2702sub reload_regions { 2931sub reload_regions {
2703 load_resource_file "$MAPDIR/regions" 2932 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n"; 2933 or die "unable to load regions file\n";
2934
2935 for (cf::region::list) {
2936 $_->{match} = qr/$_->{match}/
2937 if exists $_->{match};
2938 }
2705} 2939}
2706 2940
2707sub reload_facedata { 2941sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 2942 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 2943 or die "unable to load facedata\n";
2710} 2944}
2711 2945
2712sub reload_archetypes { 2946sub reload_archetypes {
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949 #d# NEED to laod twice to resolve forward references
2950 # this really needs to be done in an extra post-pass
2951 # (which needs to be synchronous, so solve it differently)
2713 load_resource_file "$DATADIR/archetypes" 2952 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n"; 2953 or die "unable to load archetypes\n";
2715} 2954}
2716 2955
2717sub reload_treasures { 2956sub reload_treasures {

Diff Legend

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