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.312 by root, Sat Jul 21 18:01:26 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
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 416Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 417never block itself or use any form of Event handling.
411 418
412=cut 419=cut
413 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
414sub fork_call(&@) { 430sub fork_call(&@) {
415 my ($cb, @args) = @_; 431 my ($cb, @args) = @_;
416 432
417# 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
418# or die "socketpair: $!"; 434# or die "socketpair: $!";
… …
421 437
422 if (my $pid = fork) { 438 if (my $pid = fork) {
423 close $fh2; 439 close $fh2;
424 440
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
426 $res = Coro::Storable::thaw $res; 443 $res = Coro::Storable::thaw $res;
427 444
428 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
429 446
430 die $$res unless "ARRAY" eq ref $res; 447 Carp::confess $$res unless "ARRAY" eq ref $res;
431 448
432 return wantarray ? @$res : $res->[-1]; 449 return wantarray ? @$res : $res->[-1];
433 } else { 450 } else {
434 reset_signals; 451 reset_signals;
435 local $SIG{__WARN__}; 452 local $SIG{__WARN__};
436 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
437 eval { 460 eval {
438 close $fh1; 461 close $fh1;
439 462
440 my @res = eval { $cb->(@args) }; 463 my @res = eval { $cb->(@args) };
464
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
442 }; 467 };
443 468
444 warn $@ if $@; 469 warn $@ if $@;
445 _exit 0; 470 _exit 0;
446 } 471 }
… …
847 "; 872 ";
848 die if $@; 873 die if $@;
849} 874}
850 875
851our $override; 876our $override;
852our @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?
853 878
854sub override { 879sub override {
855 $override = 1; 880 $override = 1;
856 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
857} 882}
858 883
859sub do_invoke { 884sub do_invoke {
860 my $event = shift; 885 my $event = shift;
861 my $callbacks = shift; 886 my $callbacks = shift;
862 887
863 @invoke_results = (); 888 @INVOKE_RESULTS = ();
864 889
865 local $override; 890 local $override;
866 891
867 for (@$callbacks) { 892 for (@$callbacks) {
868 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
… …
885 910
886Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
887 912
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 916
892=back 917=back
893 918
894=cut 919=cut
895 920
896############################################################################# 921#############################################################################
897# object support 922# object support
923#
924
925sub _can_merge {
926 my ($ob1, $ob2) = @_;
927
928 local $Storable::canonical = 1;
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931
932 $fob1 eq $fob2
933}
898 934
899sub reattach { 935sub reattach {
900 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 937 my ($obj) = @_;
902 938
… …
1086 cf::override; 1122 cf::override;
1087 }, 1123 },
1088 on_extcmd => sub { 1124 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1125 my ($pl, $buf) = @_;
1090 1126
1091 my $msg = eval { from_json $buf }; 1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1128
1093 if (ref $msg) { 1129 if (ref $msg) {
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1131 if (my %reply = $cb->($pl, $msg)) {
1096 $pl->ext_reply ($msg->{msgid}, %reply); 1132 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1400 # replace G<male|female> tags 1436 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1437 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1438 $self->gender ? $2 : $1
1403 }ge 1439 }ge
1404 # replace H<hint text> 1440 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1406 1448
1407 # create single paragraphs (very hackish) 1449 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1450 s/(?<=\S)\n(?=\w)/ /g;
1409 1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1410 $_ 1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1411} 1464}
1412 1465
1413=item $player->ext_reply ($msgid, %msg) 1466=item $player->ext_reply ($msgid, %msg)
1414 1467
1415Sends an ext reply to the player. 1468Sends an ext reply to the player.
… …
1418 1471
1419sub ext_reply($$%) { 1472sub ext_reply($$%) {
1420 my ($self, $id, %msg) = @_; 1473 my ($self, $id, %msg) = @_;
1421 1474
1422 $msg{msgid} = $id; 1475 $msg{msgid} = $id;
1423 $self->send ("ext " . cf::to_json \%msg); 1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1477}
1425 1478
1426=item $player->ext_event ($type, %msg) 1479=item $player->ext_event ($type, %msg)
1427 1480
1428Sends an ext event to the client. 1481Sends an ext event to the client.
… …
1453 my ($path) = @_; 1506 my ($path) = @_;
1454 1507
1455 my ($match, $specificity); 1508 my ($match, $specificity);
1456 1509
1457 for my $region (list) { 1510 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1511 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1512 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1513 if $region->specificity > $specificity;
1461 } 1514 }
1462 } 1515 }
1463 1516
… …
1583 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1584 return $self; 1637 return $self;
1585 } 1638 }
1586 } 1639 }
1587 1640
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1642 ()
1590} 1643}
1591 1644
1592sub init { 1645sub init {
1593 my ($self) = @_; 1646 my ($self) = @_;
… …
1871 1924
1872 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1873 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1874 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1876 my $map = find $path 1929 if (my $map = find $path) {
1877 or next;
1878 $map->load; 1930 $map->load;
1931 }
1879 1932
1880 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1881 } 1934 }
1882 } 1935 }
1883 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
… …
2220 2273
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
2223} 2276}
2224 2277
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2279
2227Moves the player to the given map-path and coordinates by first freezing 2280Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2281her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2282that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2283the new (success) or old (failed) map position. In either case, $done will
2284be called at the end of this process.
2231 2285
2232=cut 2286=cut
2233 2287
2234our $GOTOGEN; 2288our $GOTOGEN;
2235 2289
2236sub cf::object::player::goto { 2290sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2292
2239 # do generation counting so two concurrent goto's will be executed in-order 2293 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2295
2242 $self->enter_link; 2296 $self->enter_link;
… …
2262 2316
2263 if ($gen == $self->{_goto_generation}) { 2317 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2318 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2266 } 2320 }
2321
2322 $done->() if $done;
2267 })->prio (1); 2323 })->prio (1);
2268} 2324}
2269 2325
2270=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
2271 2327
… …
2340 my $hp = $exit->stats->hp; 2396 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2397 my $sp = $exit->stats->sp;
2342 2398
2343 $self->enter_link; 2399 $self->enter_link;
2344 2400
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2404
2345 (async { 2405 (async {
2346 $self->deactivate_recursive; # just to be sure 2406 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2407 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2408 $self->goto ($slaying, $hp, $sp);
2349 2409
… …
2376 2436
2377 utf8::encode $text; 2437 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2438 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2439}
2380 2440
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2442
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2443Send 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 2444client 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 2445the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2446the message unless the client supports the msg packet.
2387 2447
2388=cut 2448=cut
2389 2449
2390sub cf::client::send_msg { 2450sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2451 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2452
2393 $msg = $self->pl->expand_cfpod ($msg); 2453 $msg = $self->pl->expand_cfpod ($msg);
2394 2454
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case...
2458
2459 if (ref $channel) {
2460 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel);
2464 }
2465
2466 $channel = $channel->{id};
2467 }
2468
2395 if ($self->can_msg) { 2469 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2397 } else { 2471 } else {
2398 # replace some tags by gcfclient-compatible ones 2472 # replace some tags by gcfclient-compatible ones
2399 for ($msg) { 2473 for ($msg) {
2400 1 while 2474 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2423=cut 2497=cut
2424 2498
2425sub cf::client::ext_event($$%) { 2499sub cf::client::ext_event($$%) {
2426 my ($self, $type, %msg) = @_; 2500 my ($self, $type, %msg) = @_;
2427 2501
2502 return unless $self->extcmd;
2503
2428 $msg{msgtype} = "event_$type"; 2504 $msg{msgtype} = "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg); 2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2430} 2506}
2431 2507
2432=item $success = $client->query ($flags, "text", \&cb) 2508=item $success = $client->query ($flags, "text", \&cb)
2433 2509
2434Queues a query to the client, calling the given callback with 2510Queues a query to the client, calling the given callback with
… …
2457 2533
2458 1 2534 1
2459} 2535}
2460 2536
2461cf::client->attach ( 2537cf::client->attach (
2538 on_connect => sub {
2539 my ($ns) = @_;
2540
2541 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2542 },
2462 on_reply => sub { 2543 on_reply => sub {
2463 my ($ns, $msg) = @_; 2544 my ($ns, $msg) = @_;
2464 2545
2465 # this weird shuffling is so that direct followup queries 2546 # this weird shuffling is so that direct followup queries
2466 # get handled first 2547 # get handled first
… …
2481 } 2562 }
2482 }, 2563 },
2483 on_exticmd => sub { 2564 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2565 my ($ns, $buf) = @_;
2485 2566
2486 my $msg = eval { from_json $buf }; 2567 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2568
2488 if (ref $msg) { 2569 if (ref $msg) {
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2571 if (my %reply = $cb->($ns, $msg)) {
2491 $reply{msgid} = $msg->{msgid}; 2572 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply); 2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2493 } 2574 }
2494 } 2575 }
2495 } else { 2576 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 } 2578 }
… …
2554 2635
2555=pod 2636=pod
2556 2637
2557The following functions and methods are available within a safe environment: 2638The following functions and methods are available within a safe environment:
2558 2639
2559 cf::object contr pay_amount pay_player map 2640 cf::object
2641 contr pay_amount pay_player map x y force_find force_add
2642 insert remove
2643
2560 cf::object::player player 2644 cf::object::player
2561 cf::player peaceful 2645 player
2562 cf::map trigger 2646
2647 cf::player
2648 peaceful
2649
2650 cf::map
2651 trigger
2563 2652
2564=cut 2653=cut
2565 2654
2566for ( 2655for (
2567 ["cf::object" => qw(contr pay_amount pay_player map)], 2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)],
2568 ["cf::object::player" => qw(player)], 2658 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 2659 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 2660 ["cf::map" => qw(trigger)],
2571) { 2661) {
2572 no strict 'refs'; 2662 no strict 'refs';
… …
2664 { 2754 {
2665 my $faces = $facedata->{faceinfo}; 2755 my $faces = $facedata->{faceinfo};
2666 2756
2667 while (my ($face, $info) = each %$faces) { 2757 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2758 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2759 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2672 Coro::cede; 2763
2764 cf::cede_to_tick;
2673 } 2765 }
2674 2766
2675 while (my ($face, $info) = each %$faces) { 2767 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 2768 next unless $info->{smooth};
2677 my $idx = cf::face::find $face 2769 my $idx = cf::face::find $face
2678 or next; 2770 or next;
2679 if (my $smooth = cf::face::find $info->{smooth}) { 2771 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 2774 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2775 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 2776 }
2684 Coro::cede; 2777
2778 cf::cede_to_tick;
2685 } 2779 }
2686 } 2780 }
2687 2781
2688 { 2782 {
2689 my $anims = $facedata->{animinfo}; 2783 my $anims = $facedata->{animinfo};
2690 2784
2691 while (my ($anim, $info) = each %$anims) { 2785 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2786 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 2787 cf::cede_to_tick;
2694 } 2788 }
2695 2789
2696 cf::anim::invalidate_all; # d'oh 2790 cf::anim::invalidate_all; # d'oh
2791 }
2792
2793 {
2794 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798
2799 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807
2808 if ($name =~ /\.jpg$/) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 }
2818
2819 cf::cede_to_tick;
2820 }
2697 } 2821 }
2698 2822
2699 1 2823 1
2700} 2824}
2701 2825
2702sub reload_regions { 2826sub reload_regions {
2703 load_resource_file "$MAPDIR/regions" 2827 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n"; 2828 or die "unable to load regions file\n";
2829
2830 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/
2832 if exists $_->{match};
2833 }
2705} 2834}
2706 2835
2707sub reload_facedata { 2836sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 2837 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 2838 or die "unable to load facedata\n";
2710} 2839}
2711 2840
2712sub reload_archetypes { 2841sub reload_archetypes {
2842 load_resource_file "$DATADIR/archetypes"
2843 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2713 load_resource_file "$DATADIR/archetypes" 2847 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n"; 2848 or die "unable to load archetypes\n";
2715} 2849}
2716 2850
2717sub reload_treasures { 2851sub reload_treasures {

Diff Legend

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