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.313 by root, Sun Jul 22 14:17:58 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
897############################################################################# 921#############################################################################
898# 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}
899 934
900sub reattach { 935sub reattach {
901 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 937 my ($obj) = @_;
903 938
… …
1087 cf::override; 1122 cf::override;
1088 }, 1123 },
1089 on_extcmd => sub { 1124 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1125 my ($pl, $buf) = @_;
1091 1126
1092 my $msg = eval { from_json $buf }; 1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1128
1094 if (ref $msg) { 1129 if (ref $msg) {
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1131 if (my %reply = $cb->($pl, $msg)) {
1097 $pl->ext_reply ($msg->{msgid}, %reply); 1132 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1401 # replace G<male|female> tags 1436 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1437 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1438 $self->gender ? $2 : $1
1404 }ge 1439 }ge
1405 # replace H<hint text> 1440 # replace H<hint text>
1406 || 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;
1407 1448
1408 # create single paragraphs (very hackish) 1449 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1450 s/(?<=\S)\n(?=\w)/ /g;
1410 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
1411 $_ 1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1412} 1464}
1413 1465
1414=item $player->ext_reply ($msgid, %msg) 1466=item $player->ext_reply ($msgid, %msg)
1415 1467
1416Sends an ext reply to the player. 1468Sends an ext reply to the player.
… …
1419 1471
1420sub ext_reply($$%) { 1472sub ext_reply($$%) {
1421 my ($self, $id, %msg) = @_; 1473 my ($self, $id, %msg) = @_;
1422 1474
1423 $msg{msgid} = $id; 1475 $msg{msgid} = $id;
1424 $self->send ("ext " . cf::to_json \%msg); 1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1425} 1477}
1426 1478
1427=item $player->ext_event ($type, %msg) 1479=item $player->ext_event ($type, %msg)
1428 1480
1429Sends an ext event to the client. 1481Sends an ext event to the client.
… …
1454 my ($path) = @_; 1506 my ($path) = @_;
1455 1507
1456 my ($match, $specificity); 1508 my ($match, $specificity);
1457 1509
1458 for my $region (list) { 1510 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1511 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1512 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1513 if $region->specificity > $specificity;
1462 } 1514 }
1463 } 1515 }
1464 1516
… …
1584 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1585 return $self; 1637 return $self;
1586 } 1638 }
1587 } 1639 }
1588 1640
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1642 ()
1591} 1643}
1592 1644
1593sub init { 1645sub init {
1594 my ($self) = @_; 1646 my ($self) = @_;
… …
1872 1924
1873 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1874 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1877 my $map = find $path 1929 if (my $map = find $path) {
1878 or next;
1879 $map->load; 1930 $map->load;
1931 }
1880 1932
1881 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1882 } 1934 }
1883 } 1935 }
1884 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
… …
2221 2273
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
2224} 2276}
2225 2277
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2279
2228Moves 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
2229her, loading and preparing them map, calling the provided $check callback 2281her, loading and preparing them map, calling the provided $check callback
2230that 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
2231the 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.
2232 2285
2233=cut 2286=cut
2234 2287
2235our $GOTOGEN; 2288our $GOTOGEN;
2236 2289
2237sub cf::object::player::goto { 2290sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2292
2240 # 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
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2295
2243 $self->enter_link; 2296 $self->enter_link;
… …
2263 2316
2264 if ($gen == $self->{_goto_generation}) { 2317 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2318 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2267 } 2320 }
2321
2322 $done->() if $done;
2268 })->prio (1); 2323 })->prio (1);
2269} 2324}
2270 2325
2271=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
2272 2327
… …
2341 my $hp = $exit->stats->hp; 2396 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2397 my $sp = $exit->stats->sp;
2343 2398
2344 $self->enter_link; 2399 $self->enter_link;
2345 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
2346 (async { 2405 (async {
2347 $self->deactivate_recursive; # just to be sure 2406 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2407 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2408 $self->goto ($slaying, $hp, $sp);
2350 2409
… …
2377 2436
2378 utf8::encode $text; 2437 utf8::encode $text;
2379 $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);
2380} 2439}
2381 2440
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2442
2384Send 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
2385client 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
2386the 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
2387the message unless the client supports the msg packet. 2446the message unless the client supports the msg packet.
2388 2447
2389=cut 2448=cut
2390 2449
2391sub cf::client::send_msg { 2450sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2451 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2452
2394 $msg = $self->pl->expand_cfpod ($msg); 2453 $msg = $self->pl->expand_cfpod ($msg);
2395 2454
2455 $color &= ~cf::NDI_UNIQUE; # just in case...
2456
2457 if (ref $channel) {
2458 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel);
2462 }
2463
2464 $channel = $channel->{id};
2465 }
2466
2467 return unless @extra || length $msg;
2468
2396 if ($self->can_msg) { 2469 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2398 } else { 2471 } else {
2399 # replace some tags by gcfclient-compatible ones 2472 # replace some tags by gcfclient-compatible ones
2400 for ($msg) { 2473 for ($msg) {
2401 1 while 2474 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2424=cut 2497=cut
2425 2498
2426sub cf::client::ext_event($$%) { 2499sub cf::client::ext_event($$%) {
2427 my ($self, $type, %msg) = @_; 2500 my ($self, $type, %msg) = @_;
2428 2501
2502 return unless $self->extcmd;
2503
2429 $msg{msgtype} = "event_$type"; 2504 $msg{msgtype} = "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2431} 2506}
2432 2507
2433=item $success = $client->query ($flags, "text", \&cb) 2508=item $success = $client->query ($flags, "text", \&cb)
2434 2509
2435Queues a query to the client, calling the given callback with 2510Queues a query to the client, calling the given callback with
… …
2458 2533
2459 1 2534 1
2460} 2535}
2461 2536
2462cf::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 },
2463 on_reply => sub { 2543 on_reply => sub {
2464 my ($ns, $msg) = @_; 2544 my ($ns, $msg) = @_;
2465 2545
2466 # this weird shuffling is so that direct followup queries 2546 # this weird shuffling is so that direct followup queries
2467 # get handled first 2547 # get handled first
… …
2482 } 2562 }
2483 }, 2563 },
2484 on_exticmd => sub { 2564 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2565 my ($ns, $buf) = @_;
2486 2566
2487 my $msg = eval { from_json $buf }; 2567 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2568
2489 if (ref $msg) { 2569 if (ref $msg) {
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2571 if (my %reply = $cb->($ns, $msg)) {
2492 $reply{msgid} = $msg->{msgid}; 2572 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply); 2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2494 } 2574 }
2495 } 2575 }
2496 } else { 2576 } else {
2497 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";
2498 } 2578 }
… …
2555 2635
2556=pod 2636=pod
2557 2637
2558The following functions and methods are available within a safe environment: 2638The following functions and methods are available within a safe environment:
2559 2639
2560 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
2561 cf::object::player player 2644 cf::object::player
2562 cf::player peaceful 2645 player
2563 cf::map trigger 2646
2647 cf::player
2648 peaceful
2649
2650 cf::map
2651 trigger
2564 2652
2565=cut 2653=cut
2566 2654
2567for ( 2655for (
2568 ["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)],
2569 ["cf::object::player" => qw(player)], 2658 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2659 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2660 ["cf::map" => qw(trigger)],
2572) { 2661) {
2573 no strict 'refs'; 2662 no strict 'refs';
… …
2665 { 2754 {
2666 my $faces = $facedata->{faceinfo}; 2755 my $faces = $facedata->{faceinfo};
2667 2756
2668 while (my ($face, $info) = each %$faces) { 2757 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2758 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2759 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2673 Coro::cede; 2763
2764 cf::cede_to_tick;
2674 } 2765 }
2675 2766
2676 while (my ($face, $info) = each %$faces) { 2767 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2768 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2769 my $idx = cf::face::find $face
2679 or next; 2770 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2771 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2774 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2775 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2776 }
2685 Coro::cede; 2777
2778 cf::cede_to_tick;
2686 } 2779 }
2687 } 2780 }
2688 2781
2689 { 2782 {
2690 my $anims = $facedata->{animinfo}; 2783 my $anims = $facedata->{animinfo};
2691 2784
2692 while (my ($anim, $info) = each %$anims) { 2785 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2786 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2787 cf::cede_to_tick;
2695 } 2788 }
2696 2789
2697 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 }
2698 } 2821 }
2699 2822
2700 1 2823 1
2701} 2824}
2702 2825
2703sub reload_regions { 2826sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2827 load_resource_file "$MAPDIR/regions"
2705 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 }
2706} 2834}
2707 2835
2708sub reload_facedata { 2836sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2837 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2838 or die "unable to load facedata\n";
2711} 2839}
2712 2840
2713sub 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)
2714 load_resource_file "$DATADIR/archetypes" 2847 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2848 or die "unable to load archetypes\n";
2716} 2849}
2717 2850
2718sub reload_treasures { 2851sub reload_treasures {

Diff Legend

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