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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.311 by root, Fri Jul 20 16:11:10 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
… …
164=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
165 167
166These 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
167returns 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
168per 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.
169 177
170=back 178=back
171 179
172=cut 180=cut
173 181
… …
237 $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;
238 $d 246 $d
239 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
240} 248}
241 249
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
245 251
246Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
247 253
248=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
249 255
250Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
251 257
252=cut 258=cut
253 259
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 261
256sub to_json ($) { $json_coder->encode ($_[0]) } 262sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 263sub from_json ($) { $json_coder->decode ($_[0]) }
258 264
259=item cf::lock_wait $string 265=item cf::lock_wait $string
… …
410Coro::Storable. May, of course, block. Note that the executed sub may 416Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 417never block itself or use any form of Event handling.
412 418
413=cut 419=cut
414 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
415sub fork_call(&@) { 430sub fork_call(&@) {
416 my ($cb, @args) = @_; 431 my ($cb, @args) = @_;
417 432
418# 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
419# or die "socketpair: $!"; 434# or die "socketpair: $!";
… …
422 437
423 if (my $pid = fork) { 438 if (my $pid = fork) {
424 close $fh2; 439 close $fh2;
425 440
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res; 443 $res = Coro::Storable::thaw $res;
428 444
429 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
430 446
431 die $$res unless "ARRAY" eq ref $res; 447 Carp::confess $$res unless "ARRAY" eq ref $res;
432 448
433 return wantarray ? @$res : $res->[-1]; 449 return wantarray ? @$res : $res->[-1];
434 } else { 450 } else {
435 reset_signals; 451 reset_signals;
436 local $SIG{__WARN__}; 452 local $SIG{__WARN__};
437 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
438 eval { 460 eval {
439 close $fh1; 461 close $fh1;
440 462
441 my @res = eval { $cb->(@args) }; 463 my @res = eval { $cb->(@args) };
464
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
443 }; 467 };
444 468
445 warn $@ if $@; 469 warn $@ if $@;
446 _exit 0; 470 _exit 0;
447 } 471 }
… …
848 "; 872 ";
849 die if $@; 873 die if $@;
850} 874}
851 875
852our $override; 876our $override;
853our @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?
854 878
855sub override { 879sub override {
856 $override = 1; 880 $override = 1;
857 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
858} 882}
859 883
860sub do_invoke { 884sub do_invoke {
861 my $event = shift; 885 my $event = shift;
862 my $callbacks = shift; 886 my $callbacks = shift;
863 887
864 @invoke_results = (); 888 @INVOKE_RESULTS = ();
865 889
866 local $override; 890 local $override;
867 891
868 for (@$callbacks) { 892 for (@$callbacks) {
869 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
… …
886 910
887Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
888 912
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 916
893=back 917=back
894 918
895=cut 919=cut
896 920
… …
1087 cf::override; 1111 cf::override;
1088 }, 1112 },
1089 on_extcmd => sub { 1113 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1114 my ($pl, $buf) = @_;
1091 1115
1092 my $msg = eval { from_json $buf }; 1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1117
1094 if (ref $msg) { 1118 if (ref $msg) {
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1120 if (my %reply = $cb->($pl, $msg)) {
1097 $pl->ext_reply ($msg->{msgid}, %reply); 1121 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1401 # replace G<male|female> tags 1425 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1426 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1427 $self->gender ? $2 : $1
1404 }ge 1428 }ge
1405 # replace H<hint text> 1429 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 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;
1407 1437
1408 # create single paragraphs (very hackish) 1438 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1439 s/(?<=\S)\n(?=\w)/ /g;
1410 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
1411 $_ 1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1412} 1453}
1413 1454
1414=item $player->ext_reply ($msgid, %msg) 1455=item $player->ext_reply ($msgid, %msg)
1415 1456
1416Sends an ext reply to the player. 1457Sends an ext reply to the player.
… …
1419 1460
1420sub ext_reply($$%) { 1461sub ext_reply($$%) {
1421 my ($self, $id, %msg) = @_; 1462 my ($self, $id, %msg) = @_;
1422 1463
1423 $msg{msgid} = $id; 1464 $msg{msgid} = $id;
1424 $self->send ("ext " . cf::to_json \%msg); 1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1425} 1466}
1426 1467
1427=item $player->ext_event ($type, %msg) 1468=item $player->ext_event ($type, %msg)
1428 1469
1429Sends an ext event to the client. 1470Sends an ext event to the client.
… …
1454 my ($path) = @_; 1495 my ($path) = @_;
1455 1496
1456 my ($match, $specificity); 1497 my ($match, $specificity);
1457 1498
1458 for my $region (list) { 1499 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1500 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1501 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1502 if $region->specificity > $specificity;
1462 } 1503 }
1463 } 1504 }
1464 1505
… …
1584 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1585 return $self; 1626 return $self;
1586 } 1627 }
1587 } 1628 }
1588 1629
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1631 ()
1591} 1632}
1592 1633
1593sub init { 1634sub init {
1594 my ($self) = @_; 1635 my ($self) = @_;
… …
1872 1913
1873 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1874 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1877 my $map = find $path 1918 if (my $map = find $path) {
1878 or next;
1879 $map->load; 1919 $map->load;
1920 }
1880 1921
1881 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1882 } 1923 }
1883 } 1924 }
1884 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
… …
2221 2262
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
2224} 2265}
2225 2266
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2268
2228Moves 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
2229her, loading and preparing them map, calling the provided $check callback 2270her, loading and preparing them map, calling the provided $check callback
2230that 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
2231the 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.
2232 2274
2233=cut 2275=cut
2234 2276
2235our $GOTOGEN; 2277our $GOTOGEN;
2236 2278
2237sub cf::object::player::goto { 2279sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2281
2240 # 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
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2284
2243 $self->enter_link; 2285 $self->enter_link;
… …
2263 2305
2264 if ($gen == $self->{_goto_generation}) { 2306 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2307 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2267 } 2309 }
2310
2311 $done->() if $done;
2268 })->prio (1); 2312 })->prio (1);
2269} 2313}
2270 2314
2271=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
2272 2316
… …
2341 my $hp = $exit->stats->hp; 2385 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2386 my $sp = $exit->stats->sp;
2343 2387
2344 $self->enter_link; 2388 $self->enter_link;
2345 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
2346 (async { 2394 (async {
2347 $self->deactivate_recursive; # just to be sure 2395 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2396 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2397 $self->goto ($slaying, $hp, $sp);
2350 2398
… …
2377 2425
2378 utf8::encode $text; 2426 utf8::encode $text;
2379 $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);
2380} 2428}
2381 2429
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2430=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2431
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2432Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2433client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2434the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2435the message unless the client supports the msg packet.
2388 2436
2389=cut 2437=cut
2390 2438
2391sub cf::client::send_msg { 2439sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2440 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2441
2394 $msg = $self->pl->expand_cfpod ($msg); 2442 $msg = $self->pl->expand_cfpod ($msg);
2395 2443
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case...
2447
2448 if (ref $channel) {
2449 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel);
2453 }
2454
2455 $channel = $channel->{id};
2456 }
2457
2396 if ($self->can_msg) { 2458 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2398 } else { 2460 } else {
2399 # replace some tags by gcfclient-compatible ones 2461 # replace some tags by gcfclient-compatible ones
2400 for ($msg) { 2462 for ($msg) {
2401 1 while 2463 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2424=cut 2486=cut
2425 2487
2426sub cf::client::ext_event($$%) { 2488sub cf::client::ext_event($$%) {
2427 my ($self, $type, %msg) = @_; 2489 my ($self, $type, %msg) = @_;
2428 2490
2491 return unless $self->extcmd;
2492
2429 $msg{msgtype} = "event_$type"; 2493 $msg{msgtype} = "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2431} 2495}
2432 2496
2433=item $success = $client->query ($flags, "text", \&cb) 2497=item $success = $client->query ($flags, "text", \&cb)
2434 2498
2435Queues a query to the client, calling the given callback with 2499Queues a query to the client, calling the given callback with
… …
2458 2522
2459 1 2523 1
2460} 2524}
2461 2525
2462cf::client->attach ( 2526cf::client->attach (
2527 on_connect => sub {
2528 my ($ns) = @_;
2529
2530 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2531 },
2463 on_reply => sub { 2532 on_reply => sub {
2464 my ($ns, $msg) = @_; 2533 my ($ns, $msg) = @_;
2465 2534
2466 # this weird shuffling is so that direct followup queries 2535 # this weird shuffling is so that direct followup queries
2467 # get handled first 2536 # get handled first
… …
2482 } 2551 }
2483 }, 2552 },
2484 on_exticmd => sub { 2553 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2554 my ($ns, $buf) = @_;
2486 2555
2487 my $msg = eval { from_json $buf }; 2556 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2557
2489 if (ref $msg) { 2558 if (ref $msg) {
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2560 if (my %reply = $cb->($ns, $msg)) {
2492 $reply{msgid} = $msg->{msgid}; 2561 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply); 2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2494 } 2563 }
2495 } 2564 }
2496 } else { 2565 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2567 }
… …
2555 2624
2556=pod 2625=pod
2557 2626
2558The following functions and methods are available within a safe environment: 2627The following functions and methods are available within a safe environment:
2559 2628
2560 cf::object contr pay_amount pay_player map 2629 cf::object
2630 contr pay_amount pay_player map x y force_find force_add
2631 insert remove
2632
2561 cf::object::player player 2633 cf::object::player
2562 cf::player peaceful 2634 player
2563 cf::map trigger 2635
2636 cf::player
2637 peaceful
2638
2639 cf::map
2640 trigger
2564 2641
2565=cut 2642=cut
2566 2643
2567for ( 2644for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)],
2569 ["cf::object::player" => qw(player)], 2647 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2648 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2649 ["cf::map" => qw(trigger)],
2572) { 2650) {
2573 no strict 'refs'; 2651 no strict 'refs';
… …
2665 { 2743 {
2666 my $faces = $facedata->{faceinfo}; 2744 my $faces = $facedata->{faceinfo};
2667 2745
2668 while (my ($face, $info) = each %$faces) { 2746 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2747 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2748 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2673 Coro::cede; 2752
2753 cf::cede_to_tick;
2674 } 2754 }
2675 2755
2676 while (my ($face, $info) = each %$faces) { 2756 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2757 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2758 my $idx = cf::face::find $face
2679 or next; 2759 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2760 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2763 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2764 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2765 }
2685 Coro::cede; 2766
2767 cf::cede_to_tick;
2686 } 2768 }
2687 } 2769 }
2688 2770
2689 { 2771 {
2690 my $anims = $facedata->{animinfo}; 2772 my $anims = $facedata->{animinfo};
2691 2773
2692 while (my ($anim, $info) = each %$anims) { 2774 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2775 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2776 cf::cede_to_tick;
2695 } 2777 }
2696 2778
2697 cf::anim::invalidate_all; # d'oh 2779 cf::anim::invalidate_all; # d'oh
2780 }
2781
2782 {
2783 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787
2788 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2796
2797 if ($name =~ /\.jpg$/) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2800 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 }
2807
2808 cf::cede_to_tick;
2809 }
2698 } 2810 }
2699 2811
2700 1 2812 1
2701} 2813}
2702 2814
2703sub reload_regions { 2815sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2816 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 2817 or die "unable to load regions file\n";
2818
2819 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/
2821 if exists $_->{match};
2822 }
2706} 2823}
2707 2824
2708sub reload_facedata { 2825sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2826 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2827 or die "unable to load facedata\n";
2711} 2828}
2712 2829
2713sub reload_archetypes { 2830sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 2836 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2837 or die "unable to load archetypes\n";
2716} 2838}
2717 2839
2718sub reload_treasures { 2840sub reload_treasures {

Diff Legend

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