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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.310 by elmex, Mon Jul 16 15:43:49 2007 UTC

… …
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
30use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
31use Time::HiRes; 32use Time::HiRes;
32use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
33 35
34# configure various modules to our taste 36# configure various modules to our taste
35# 37#
36$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
… …
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
… …
163=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
164 167
165These 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
166returns 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
167per 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.
168 177
169=back 178=back
170 179
171=cut 180=cut
172 181
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 246 $d
238 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
239} 248}
240 249
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
244 251
245Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
246 253
247=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
248 255
249Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
257
258=cut
259
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261
262sub to_json ($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) }
250 264
251=item cf::lock_wait $string 265=item cf::lock_wait $string
252 266
253Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
254 268
… …
402Coro::Storable. May, of course, block. Note that the executed sub may 416Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 417never block itself or use any form of Event handling.
404 418
405=cut 419=cut
406 420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
407sub fork_call(&@) { 430sub fork_call(&@) {
408 my ($cb, @args) = @_; 431 my ($cb, @args) = @_;
409 432
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411# or die "socketpair: $!"; 434# or die "socketpair: $!";
… …
414 437
415 if (my $pid = fork) { 438 if (my $pid = fork) {
416 close $fh2; 439 close $fh2;
417 440
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
419 $res = Coro::Storable::thaw $res; 443 $res = Coro::Storable::thaw $res;
420 444
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422 446
423 die $$res unless "ARRAY" eq ref $res; 447 Carp::confess $$res unless "ARRAY" eq ref $res;
424 448
425 return wantarray ? @$res : $res->[-1]; 449 return wantarray ? @$res : $res->[-1];
426 } else { 450 } else {
427 reset_signals; 451 reset_signals;
428 local $SIG{__WARN__}; 452 local $SIG{__WARN__};
429 local $SIG{__DIE__}; 453 local $SIG{__DIE__};
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459
430 eval { 460 eval {
431 close $fh1; 461 close $fh1;
432 462
433 my @res = eval { $cb->(@args) }; 463 my @res = eval { $cb->(@args) };
464
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
435 }; 467 };
436 468
437 warn $@ if $@; 469 warn $@ if $@;
438 _exit 0; 470 _exit 0;
439 } 471 }
… …
840 "; 872 ";
841 die if $@; 873 die if $@;
842} 874}
843 875
844our $override; 876our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 877our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 878
847sub override { 879sub override {
848 $override = 1; 880 $override = 1;
849 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
850} 882}
851 883
852sub do_invoke { 884sub do_invoke {
853 my $event = shift; 885 my $event = shift;
854 my $callbacks = shift; 886 my $callbacks = shift;
855 887
856 @invoke_results = (); 888 @INVOKE_RESULTS = ();
857 889
858 local $override; 890 local $override;
859 891
860 for (@$callbacks) { 892 for (@$callbacks) {
861 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
… …
878 910
879Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
880 912
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 913This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 914removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 916
885=back 917=back
886 918
887=cut 919=cut
888 920
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1061 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1062}
1031 1063
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1064=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1065
1034Register a callback fro execution when the client sends an extcmd packet. 1066Register a callback for execution when the client sends an (synchronous)
1067extcmd packet. Ext commands will be processed in the order they are
1068received by the server, like other user commands. The first argument is
1069the logged-in player. Ext commands can only be processed after a player
1070has logged in successfully.
1035 1071
1036If the callback returns something, it is sent back as if reply was being 1072If the callback returns something, it is sent back as if reply was being
1037called. 1073called.
1038 1074
1075=item cf::register_exticmd $name => \&callback($ns,$packet);
1076
1077Register a callback for execution when the client sends an (asynchronous)
1078exticmd packet. Exti commands are processed by the server as soon as they
1079are received, i.e. out of order w.r.t. other commands. The first argument
1080is a client socket. Exti commands can be received anytime, even before
1081log-in.
1082
1083If the callback returns something, it is sent back as if reply was being
1084called.
1085
1039=cut 1086=cut
1040 1087
1041sub register_extcmd { 1088sub register_extcmd {
1042 my ($name, $cb) = @_; 1089 my ($name, $cb) = @_;
1043 1090
1044 $EXTCMD{$name} = $cb; 1091 $EXTCMD{$name} = $cb;
1092}
1093
1094sub register_exticmd {
1095 my ($name, $cb) = @_;
1096
1097 $EXTICMD{$name} = $cb;
1045} 1098}
1046 1099
1047cf::player->attach ( 1100cf::player->attach (
1048 on_command => sub { 1101 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1102 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1111 cf::override;
1059 }, 1112 },
1060 on_extcmd => sub { 1113 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1114 my ($pl, $buf) = @_;
1062 1115
1063 my $msg = eval { from_json $buf }; 1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1117
1065 if (ref $msg) { 1118 if (ref $msg) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1120 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1121 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1347 } 1400 }
1348 1401
1349 \@paths 1402 \@paths
1350} 1403}
1351 1404
1405=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1406
1407Expand crossfire pod fragments into protocol xml.
1408
1409=cut
1410
1411sub expand_cfpod {
1412 ((my $self), (local $_)) = @_;
1413
1414 # escape & and <
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417
1418 # this is buggy, it needs to properly take care of nested <'s
1419
1420 1 while
1421 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/
1425 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1
1428 }ge
1429 # replace H<hint text>
1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1437
1438 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g;
1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1453}
1454
1352=item $player->ext_reply ($msgid, %msg) 1455=item $player->ext_reply ($msgid, %msg)
1353 1456
1354Sends an ext reply to the player. 1457Sends an ext reply to the player.
1355 1458
1356=cut 1459=cut
1357 1460
1358sub ext_reply($$%) { 1461sub ext_reply($$%) {
1359 my ($self, $id, %msg) = @_; 1462 my ($self, $id, %msg) = @_;
1360 1463
1361 $msg{msgid} = $id; 1464 $msg{msgid} = $id;
1362 1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1466}
1365 1467
1366=item $player->ext_event ($type, %msg) 1468=item $player->ext_event ($type, %msg)
1367 1469
1368Sends an ext event to the client. 1470Sends an ext event to the client.
… …
1393 my ($path) = @_; 1495 my ($path) = @_;
1394 1496
1395 my ($match, $specificity); 1497 my ($match, $specificity);
1396 1498
1397 for my $region (list) { 1499 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1500 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1501 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1502 if $region->specificity > $specificity;
1401 } 1503 }
1402 } 1504 }
1403 1505
… …
1523 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1524 return $self; 1626 return $self;
1525 } 1627 }
1526 } 1628 }
1527 1629
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1631 ()
1530} 1632}
1531 1633
1532sub init { 1634sub init {
1533 my ($self) = @_; 1635 my ($self) = @_;
… …
1811 1913
1812 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1813 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1814 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1816 my $map = find $path 1918 if (my $map = find $path) {
1817 or next;
1818 $map->load; 1919 $map->load;
1920 }
1819 1921
1820 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1821 } 1923 }
1822 } 1924 }
1823 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
… …
2052 my $pl = $self->contr; 2154 my $pl = $self->contr;
2053 2155
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2157 my $diag = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2158 $diag->{pl}->ext_reply (
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => [] 2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2058 ); 2163 );
2059 2164
2060 } else { 2165 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2166 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2167 $self->message ($msg, $flags);
… …
2157 2262
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
2160} 2265}
2161 2266
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2268
2164Moves the player to the given map-path and coordinates by first freezing 2269Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2270her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2271that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2272the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process.
2168 2274
2169=cut 2275=cut
2170 2276
2171our $GOTOGEN; 2277our $GOTOGEN;
2172 2278
2173sub cf::object::player::goto { 2279sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2281
2176 # do generation counting so two concurrent goto's will be executed in-order 2282 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2284
2179 $self->enter_link; 2285 $self->enter_link;
… …
2199 2305
2200 if ($gen == $self->{_goto_generation}) { 2306 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2307 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2203 } 2309 }
2310
2311 $done->() if $done;
2204 })->prio (1); 2312 })->prio (1);
2205} 2313}
2206 2314
2207=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
2208 2316
… …
2277 my $hp = $exit->stats->hp; 2385 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp; 2386 my $sp = $exit->stats->sp;
2279 2387
2280 $self->enter_link; 2388 $self->enter_link;
2281 2389
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2282 (async { 2394 (async {
2283 $self->deactivate_recursive; # just to be sure 2395 $self->deactivate_recursive; # just to be sure
2284 unless (eval { 2396 unless (eval {
2285 $self->goto ($slaying, $hp, $sp); 2397 $self->goto ($slaying, $hp, $sp);
2286 2398
… …
2313 2425
2314 utf8::encode $text; 2426 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2428}
2317 2429
2430=item $client->send_msg ($color, $type, $msg, [extra...])
2431
2432Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of
2434the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet.
2436
2437=cut
2438
2439sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_;
2441
2442 $msg = $self->pl->expand_cfpod ($msg);
2443
2444 return unless @extra || length $msg;
2445
2446 if ($self->can_msg) {
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2448 } else {
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458
2459 if ($color >= 0) {
2460 if (0 && $msg =~ /\[/) {
2461 $self->send_packet ("drawextinfo $color 4 0 $msg")
2462 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg")
2465 }
2466 }
2467 }
2468}
2469
2318=item $client->ext_event ($type, %msg) 2470=item $client->ext_event ($type, %msg)
2319 2471
2320Sends an exti event to the client. 2472Sends an ext event to the client.
2321 2473
2322=cut 2474=cut
2323 2475
2324sub cf::client::ext_event($$%) { 2476sub cf::client::ext_event($$%) {
2325 my ($self, $type, %msg) = @_; 2477 my ($self, $type, %msg) = @_;
2326 2478
2479 return unless $self->extcmd;
2480
2327 $msg{msgtype} = "event_$type"; 2481 $msg{msgtype} = "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2329} 2483}
2330 2484
2331=item $success = $client->query ($flags, "text", \&cb) 2485=item $success = $client->query ($flags, "text", \&cb)
2332 2486
2333Queues a query to the client, calling the given callback with 2487Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2488the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2489C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2490
2337Queries can fail, so check the return code. Or don't, as queries will become 2491Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2492become reliable at some point in the future.
2339 2493
2340=cut 2494=cut
2341 2495
2342sub cf::client::query { 2496sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2497 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2505 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2506 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2507
2354 $self->send_packet ($self->{query_queue}[0][0]) 2508 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2509 if @{ $self->{query_queue} } == 1;
2510
2511 1
2356} 2512}
2357 2513
2358cf::client->attach ( 2514cf::client->attach (
2515 on_connect => sub {
2516 my ($ns) = @_;
2517
2518 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2519 },
2359 on_reply => sub { 2520 on_reply => sub {
2360 my ($ns, $msg) = @_; 2521 my ($ns, $msg) = @_;
2361 2522
2362 # this weird shuffling is so that direct followup queries 2523 # this weird shuffling is so that direct followup queries
2363 # get handled first 2524 # get handled first
… …
2375 } else { 2536 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2537 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2538 }
2378 } 2539 }
2379 }, 2540 },
2541 on_exticmd => sub {
2542 my ($ns, $buf) = @_;
2543
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545
2546 if (ref $msg) {
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2548 if (my %reply = $cb->($ns, $msg)) {
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 }
2553 } else {
2554 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555 }
2556
2557 cf::override;
2558 },
2380); 2559);
2381 2560
2382=item $client->async (\&cb) 2561=item $client->async (\&cb)
2383 2562
2384Create a new coroutine, running the specified callback. The coroutine will 2563Create a new coroutine, running the specified callback. The coroutine will
… …
2433 2612
2434=pod 2613=pod
2435 2614
2436The following functions and methods are available within a safe environment: 2615The following functions and methods are available within a safe environment:
2437 2616
2438 cf::object contr pay_amount pay_player map 2617 cf::object
2618 contr pay_amount pay_player map x y force_find force_add
2619 insert remove
2620
2439 cf::object::player player 2621 cf::object::player
2440 cf::player peaceful 2622 player
2441 cf::map trigger 2623
2624 cf::player
2625 peaceful
2626
2627 cf::map
2628 trigger
2442 2629
2443=cut 2630=cut
2444 2631
2445for ( 2632for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2634 insert remove)],
2447 ["cf::object::player" => qw(player)], 2635 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 2636 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 2637 ["cf::map" => qw(trigger)],
2450) { 2638) {
2451 no strict 'refs'; 2639 no strict 'refs';
… …
2543 { 2731 {
2544 my $faces = $facedata->{faceinfo}; 2732 my $faces = $facedata->{faceinfo};
2545 2733
2546 while (my ($face, $info) = each %$faces) { 2734 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2735 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2736 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2551 Coro::cede; 2740
2741 cf::cede_to_tick;
2552 } 2742 }
2553 2743
2554 while (my ($face, $info) = each %$faces) { 2744 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 2745 next unless $info->{smooth};
2556 my $idx = cf::face::find $face 2746 my $idx = cf::face::find $face
2557 or next; 2747 or next;
2558 if (my $smooth = cf::face::find $info->{smooth}) { 2748 if (my $smooth = cf::face::find $info->{smooth}) {
2749 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2750 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 2751 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2752 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 2753 }
2563 Coro::cede; 2754
2755 cf::cede_to_tick;
2564 } 2756 }
2565 } 2757 }
2566 2758
2567 { 2759 {
2568 my $anims = $facedata->{animinfo}; 2760 my $anims = $facedata->{animinfo};
2569 2761
2570 while (my ($anim, $info) = each %$anims) { 2762 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2763 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 2764 cf::cede_to_tick;
2573 } 2765 }
2574 2766
2575 cf::anim::invalidate_all; # d'oh 2767 cf::anim::invalidate_all; # d'oh
2768 }
2769
2770 {
2771 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical;
2775
2776 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2784
2785 if ($name =~ /\.jpg$/) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2788 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 }
2795
2796 cf::cede_to_tick;
2797 }
2576 } 2798 }
2577 2799
2578 1 2800 1
2579} 2801}
2580 2802
2581sub reload_regions { 2803sub reload_regions {
2582 load_resource_file "$MAPDIR/regions" 2804 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 2805 or die "unable to load regions file\n";
2806
2807 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/
2809 if exists $_->{match};
2810 }
2584} 2811}
2585 2812
2586sub reload_facedata { 2813sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 2814 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 2815 or die "unable to load facedata\n";
2589} 2816}
2590 2817
2591sub reload_archetypes { 2818sub reload_archetypes {
2819 load_resource_file "$DATADIR/archetypes"
2820 or die "unable to load archetypes\n";
2821 #d# NEED to laod twice to resolve forward references
2822 # this really needs to be done in an extra post-pass
2823 # (which needs to be synchronous, so solve it differently)
2592 load_resource_file "$DATADIR/archetypes" 2824 load_resource_file "$DATADIR/archetypes"
2593 or die "unable to load archetypes\n"; 2825 or die "unable to load archetypes\n";
2594} 2826}
2595 2827
2596sub reload_treasures { 2828sub reload_treasures {
… …
2790 %EXT_CORO = (); 3022 %EXT_CORO = ();
2791 3023
2792 warn "removing commands"; 3024 warn "removing commands";
2793 %COMMAND = (); 3025 %COMMAND = ();
2794 3026
2795 warn "removing ext commands"; 3027 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3028 %EXTCMD = ();
3029 %EXTICMD = ();
2797 3030
2798 warn "unloading/nuking all extensions"; 3031 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3032 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3033 warn "... unloading $pkg";
2801 3034

Diff Legend

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