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.315 by root, Mon Jul 23 17:53:55 2007 UTC

… …
29use Fcntl; 29use Fcntl;
30use YAML::Syck (); 30use YAML::Syck ();
31use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
32use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
34 35
35# configure various modules to our taste 36# configure various modules to our taste
36# 37#
37$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
166 167
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 169returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
170 177
171=back 178=back
172 179
173=cut 180=cut
174 181
… …
248 255
249Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
250 257
251=cut 258=cut
252 259
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 261
255sub to_json ($) { $json_coder->encode ($_[0]) } 262sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 263sub from_json ($) { $json_coder->decode ($_[0]) }
257 264
258=item cf::lock_wait $string 265=item cf::lock_wait $string
… …
313 my $guard = Coro::guard { 320 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 321 $TICK_WATCHER->start;
315 }; 322 };
316 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
317 $guard 324 $guard
325}
326
327=item cf::get_slot $time[, $priority[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
318} 381}
319 382
320=item cf::async { BLOCK } 383=item cf::async { BLOCK }
321 384
322Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
411 474
412=cut 475=cut
413 476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
414sub fork_call(&@) { 486sub fork_call(&@) {
415 my ($cb, @args) = @_; 487 my ($cb, @args) = @_;
416 488
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
418# or die "socketpair: $!"; 490# or die "socketpair: $!";
… …
421 493
422 if (my $pid = fork) { 494 if (my $pid = fork) {
423 close $fh2; 495 close $fh2;
424 496
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
426 $res = Coro::Storable::thaw $res; 499 $res = Coro::Storable::thaw $res;
427 500
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429 502
430 die $$res unless "ARRAY" eq ref $res; 503 Carp::confess $$res unless "ARRAY" eq ref $res;
431 504
432 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
433 } else { 506 } else {
434 reset_signals; 507 reset_signals;
435 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
436 local $SIG{__DIE__}; 509 local $SIG{__DIE__};
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
437 eval { 516 eval {
438 close $fh1; 517 close $fh1;
439 518
440 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
520
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
442 }; 523 };
443 524
444 warn $@ if $@; 525 warn $@ if $@;
445 _exit 0; 526 _exit 0;
446 } 527 }
… …
847 "; 928 ";
848 die if $@; 929 die if $@;
849} 930}
850 931
851our $override; 932our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 934
854sub override { 935sub override {
855 $override = 1; 936 $override = 1;
856 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
857} 938}
858 939
859sub do_invoke { 940sub do_invoke {
860 my $event = shift; 941 my $event = shift;
861 my $callbacks = shift; 942 my $callbacks = shift;
862 943
863 @invoke_results = (); 944 @INVOKE_RESULTS = ();
864 945
865 local $override; 946 local $override;
866 947
867 for (@$callbacks) { 948 for (@$callbacks) {
868 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
885 966
886Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
887 968
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 970removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 972
892=back 973=back
893 974
894=cut 975=cut
895 976
896############################################################################# 977#############################################################################
897# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
898 990
899sub reattach { 991sub reattach {
900 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 993 my ($obj) = @_;
902 994
… …
1086 cf::override; 1178 cf::override;
1087 }, 1179 },
1088 on_extcmd => sub { 1180 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1090 1182
1091 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1184
1093 if (ref $msg) { 1185 if (ref $msg) {
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1187 if (my %reply = $cb->($pl, $msg)) {
1096 $pl->ext_reply ($msg->{msgid}, %reply); 1188 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1400 # replace G<male|female> tags 1492 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1493 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1494 $self->gender ? $2 : $1
1403 }ge 1495 }ge
1404 # replace H<hint text> 1496 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1497 || s{H<([^\>]*)>}
1498 {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "")
1502 [$self->{hintmode}]
1503 }ge;
1406 1504
1407 # create single paragraphs (very hackish) 1505 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1506 s/(?<=\S)\n(?=\w)/ /g;
1409 1507
1508 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines
1513
1410 $_ 1514 $_
1515}
1516
1517sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode}
1411} 1520}
1412 1521
1413=item $player->ext_reply ($msgid, %msg) 1522=item $player->ext_reply ($msgid, %msg)
1414 1523
1415Sends an ext reply to the player. 1524Sends an ext reply to the player.
… …
1418 1527
1419sub ext_reply($$%) { 1528sub ext_reply($$%) {
1420 my ($self, $id, %msg) = @_; 1529 my ($self, $id, %msg) = @_;
1421 1530
1422 $msg{msgid} = $id; 1531 $msg{msgid} = $id;
1423 $self->send ("ext " . cf::to_json \%msg); 1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1533}
1425 1534
1426=item $player->ext_event ($type, %msg) 1535=item $player->ext_event ($type, %msg)
1427 1536
1428Sends an ext event to the client. 1537Sends an ext event to the client.
… …
1453 my ($path) = @_; 1562 my ($path) = @_;
1454 1563
1455 my ($match, $specificity); 1564 my ($match, $specificity);
1456 1565
1457 for my $region (list) { 1566 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1567 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1568 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1569 if $region->specificity > $specificity;
1461 } 1570 }
1462 } 1571 }
1463 1572
… …
1583 $self->init; # pass $1 etc. 1692 $self->init; # pass $1 etc.
1584 return $self; 1693 return $self;
1585 } 1694 }
1586 } 1695 }
1587 1696
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1697 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1698 ()
1590} 1699}
1591 1700
1592sub init { 1701sub init {
1593 my ($self) = @_; 1702 my ($self) = @_;
… …
1871 1980
1872 undef $MAP_PREFETCH{$path}; 1981 undef $MAP_PREFETCH{$path};
1873 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1874 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 1984 for my $path (keys %MAP_PREFETCH) {
1876 my $map = find $path 1985 if (my $map = find $path) {
1877 or next;
1878 $map->load; 1986 $map->load;
1987 }
1879 1988
1880 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$path};
1881 } 1990 }
1882 } 1991 }
1883 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
… …
2220 2329
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2331 $self->enter_map ($map, $x, $y);
2223} 2332}
2224 2333
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2335
2227Moves the player to the given map-path and coordinates by first freezing 2336Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2337her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2338that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2339the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process.
2231 2341
2232=cut 2342=cut
2233 2343
2234our $GOTOGEN; 2344our $GOTOGEN;
2235 2345
2236sub cf::object::player::goto { 2346sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2347 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2348
2239 # do generation counting so two concurrent goto's will be executed in-order 2349 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2351
2242 $self->enter_link; 2352 $self->enter_link;
… …
2262 2372
2263 if ($gen == $self->{_goto_generation}) { 2373 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2374 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2375 $self->leave_link ($map, $x, $y);
2266 } 2376 }
2377
2378 $done->() if $done;
2267 })->prio (1); 2379 })->prio (1);
2268} 2380}
2269 2381
2270=item $player_object->enter_exit ($exit_object) 2382=item $player_object->enter_exit ($exit_object)
2271 2383
… …
2340 my $hp = $exit->stats->hp; 2452 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2453 my $sp = $exit->stats->sp;
2342 2454
2343 $self->enter_link; 2455 $self->enter_link;
2344 2456
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2345 (async { 2461 (async {
2346 $self->deactivate_recursive; # just to be sure 2462 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2463 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2464 $self->goto ($slaying, $hp, $sp);
2349 2465
… …
2376 2492
2377 utf8::encode $text; 2493 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2494 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2495}
2380 2496
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2497=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2498
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2499Send 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 2500client 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 2501the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2502the message unless the client supports the msg packet.
2387 2503
2388=cut 2504=cut
2389 2505
2390sub cf::client::send_msg { 2506sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2507 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2508
2393 $msg = $self->pl->expand_cfpod ($msg); 2509 $msg = $self->pl->expand_cfpod ($msg);
2394 2510
2511 $color &= ~cf::NDI_UNIQUE; # just in case...
2512
2513 if (ref $channel) {
2514 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel);
2518 }
2519
2520 $channel = $channel->{id};
2521 }
2522
2523 return unless @extra || length $msg;
2524
2395 if ($self->can_msg) { 2525 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2397 } else { 2527 } else {
2398 # replace some tags by gcfclient-compatible ones 2528 # replace some tags by gcfclient-compatible ones
2399 for ($msg) { 2529 for ($msg) {
2400 1 while 2530 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
… …
2423=cut 2553=cut
2424 2554
2425sub cf::client::ext_event($$%) { 2555sub cf::client::ext_event($$%) {
2426 my ($self, $type, %msg) = @_; 2556 my ($self, $type, %msg) = @_;
2427 2557
2558 return unless $self->extcmd;
2559
2428 $msg{msgtype} = "event_$type"; 2560 $msg{msgtype} = "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg); 2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2430} 2562}
2431 2563
2432=item $success = $client->query ($flags, "text", \&cb) 2564=item $success = $client->query ($flags, "text", \&cb)
2433 2565
2434Queues a query to the client, calling the given callback with 2566Queues a query to the client, calling the given callback with
… …
2457 2589
2458 1 2590 1
2459} 2591}
2460 2592
2461cf::client->attach ( 2593cf::client->attach (
2594 on_connect => sub {
2595 my ($ns) = @_;
2596
2597 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2598 },
2462 on_reply => sub { 2599 on_reply => sub {
2463 my ($ns, $msg) = @_; 2600 my ($ns, $msg) = @_;
2464 2601
2465 # this weird shuffling is so that direct followup queries 2602 # this weird shuffling is so that direct followup queries
2466 # get handled first 2603 # get handled first
… …
2481 } 2618 }
2482 }, 2619 },
2483 on_exticmd => sub { 2620 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2621 my ($ns, $buf) = @_;
2485 2622
2486 my $msg = eval { from_json $buf }; 2623 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2624
2488 if (ref $msg) { 2625 if (ref $msg) {
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2627 if (my %reply = $cb->($ns, $msg)) {
2491 $reply{msgid} = $msg->{msgid}; 2628 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply); 2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2493 } 2630 }
2494 } 2631 }
2495 } else { 2632 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 } 2634 }
… …
2554 2691
2555=pod 2692=pod
2556 2693
2557The following functions and methods are available within a safe environment: 2694The following functions and methods are available within a safe environment:
2558 2695
2559 cf::object contr pay_amount pay_player map 2696 cf::object
2697 contr pay_amount pay_player map x y force_find force_add
2698 insert remove
2699
2560 cf::object::player player 2700 cf::object::player
2561 cf::player peaceful 2701 player
2562 cf::map trigger 2702
2703 cf::player
2704 peaceful
2705
2706 cf::map
2707 trigger
2563 2708
2564=cut 2709=cut
2565 2710
2566for ( 2711for (
2567 ["cf::object" => qw(contr pay_amount pay_player map)], 2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)],
2568 ["cf::object::player" => qw(player)], 2714 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 2715 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 2716 ["cf::map" => qw(trigger)],
2571) { 2717) {
2572 no strict 'refs'; 2718 no strict 'refs';
… …
2664 { 2810 {
2665 my $faces = $facedata->{faceinfo}; 2811 my $faces = $facedata->{faceinfo};
2666 2812
2667 while (my ($face, $info) = each %$faces) { 2813 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2814 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2815 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2672 Coro::cede; 2819
2820 cf::cede_to_tick;
2673 } 2821 }
2674 2822
2675 while (my ($face, $info) = each %$faces) { 2823 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 2824 next unless $info->{smooth};
2677 my $idx = cf::face::find $face 2825 my $idx = cf::face::find $face
2678 or next; 2826 or next;
2679 if (my $smooth = cf::face::find $info->{smooth}) { 2827 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 2830 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2831 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 2832 }
2684 Coro::cede; 2833
2834 cf::cede_to_tick;
2685 } 2835 }
2686 } 2836 }
2687 2837
2688 { 2838 {
2689 my $anims = $facedata->{animinfo}; 2839 my $anims = $facedata->{animinfo};
2690 2840
2691 while (my ($anim, $info) = each %$anims) { 2841 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2842 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 2843 cf::cede_to_tick;
2694 } 2844 }
2695 2845
2696 cf::anim::invalidate_all; # d'oh 2846 cf::anim::invalidate_all; # d'oh
2847 }
2848
2849 {
2850 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854
2855 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2863
2864 if ($name =~ /\.jpg$/) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2867 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 }
2874
2875 cf::cede_to_tick;
2876 }
2697 } 2877 }
2698 2878
2699 1 2879 1
2700} 2880}
2701 2881
2702sub reload_regions { 2882sub reload_regions {
2703 load_resource_file "$MAPDIR/regions" 2883 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n"; 2884 or die "unable to load regions file\n";
2885
2886 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/
2888 if exists $_->{match};
2889 }
2705} 2890}
2706 2891
2707sub reload_facedata { 2892sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 2893 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 2894 or die "unable to load facedata\n";
2710} 2895}
2711 2896
2712sub reload_archetypes { 2897sub reload_archetypes {
2898 load_resource_file "$DATADIR/archetypes"
2899 or die "unable to load archetypes\n";
2900 #d# NEED to laod twice to resolve forward references
2901 # this really needs to be done in an extra post-pass
2902 # (which needs to be synchronous, so solve it differently)
2713 load_resource_file "$DATADIR/archetypes" 2903 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n"; 2904 or die "unable to load archetypes\n";
2715} 2905}
2716 2906
2717sub reload_treasures { 2907sub reload_treasures {

Diff Legend

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