… | |
… | |
29 | use Fcntl; |
29 | use Fcntl; |
30 | use YAML::Syck (); |
30 | use YAML::Syck (); |
31 | use IO::AIO 2.32 (); |
31 | use IO::AIO 2.32 (); |
32 | use Time::HiRes; |
32 | use Time::HiRes; |
33 | use Compress::LZF; |
33 | use Compress::LZF; |
|
|
34 | use 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 |
38 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
39 | Coro::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 | |
167 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
168 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
168 | returns directly I<after> the tick processing (and consequently, can only wake one process |
169 | returns directly I<after> the tick processing (and consequently, can only wake one process |
169 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
170 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
|
|
171 | |
|
|
172 | =item @cf::INVOKE_RESULTS |
|
|
173 | |
|
|
174 | This array contains the results of the last C<invoke ()> call. When |
|
|
175 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
|
|
176 | that call. |
170 | |
177 | |
171 | =back |
178 | =back |
172 | |
179 | |
173 | =cut |
180 | =cut |
174 | |
181 | |
… | |
… | |
315 | }; |
322 | }; |
316 | $TICK_WATCHER->stop; |
323 | $TICK_WATCHER->stop; |
317 | $guard |
324 | $guard |
318 | } |
325 | } |
319 | |
326 | |
|
|
327 | =item cf::get_slot $time[, $priority[, $name]] |
|
|
328 | |
|
|
329 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
|
|
330 | This call blocks and returns only when you have at least C<$time> seconds |
|
|
331 | of cpu time till the next tick. The slot is only valid till the next cede. |
|
|
332 | |
|
|
333 | The optional C<$name> can be used to identify the job to run. It might be |
|
|
334 | used for statistical purposes and should identify the same time-class. |
|
|
335 | |
|
|
336 | Useful for short background jobs. |
|
|
337 | |
|
|
338 | =cut |
|
|
339 | |
|
|
340 | our @SLOT_QUEUE; |
|
|
341 | our $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 | |
|
|
371 | sub 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; |
|
|
381 | } |
|
|
382 | |
320 | =item cf::async { BLOCK } |
383 | =item cf::async { BLOCK } |
321 | |
384 | |
322 | Currently the same as Coro::async_pool, meaning you cannot use |
385 | Currently the same as Coro::async_pool, meaning you cannot use |
323 | C<on_destroy>, C<join> or other gimmicks on these coroutines. The only |
386 | C<on_destroy>, C<join> or other gimmicks on these coroutines. The only |
324 | thing you are allowed to do is call C<prio> on it. |
387 | thing you are allowed to do is call C<prio> on it. |
… | |
… | |
409 | Coro::Storable. May, of course, block. Note that the executed sub may |
472 | Coro::Storable. May, of course, block. Note that the executed sub may |
410 | never block itself or use any form of Event handling. |
473 | never block itself or use any form of Event handling. |
411 | |
474 | |
412 | =cut |
475 | =cut |
413 | |
476 | |
|
|
477 | sub _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 | |
414 | sub fork_call(&@) { |
486 | sub 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 | |
851 | our $override; |
932 | our $override; |
852 | our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
933 | our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
853 | |
934 | |
854 | sub override { |
935 | sub override { |
855 | $override = 1; |
936 | $override = 1; |
856 | @invoke_results = (); |
937 | @INVOKE_RESULTS = (@_); |
857 | } |
938 | } |
858 | |
939 | |
859 | sub do_invoke { |
940 | sub 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 | |
886 | Generate an object-specific event with the given arguments. |
967 | Generate an object-specific event with the given arguments. |
887 | |
968 | |
888 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
969 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
889 | removed in future versions), and there is no public API to access override |
970 | removed in future versions), and there is no public API to access override |
890 | results (if you must, access C<@cf::invoke_results> directly). |
971 | results (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 | |
|
|
981 | sub _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 | |
899 | sub reattach { |
991 | sub 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 | |
… | |
… | |
1470 | my ($path) = @_; |
1562 | my ($path) = @_; |
1471 | |
1563 | |
1472 | my ($match, $specificity); |
1564 | my ($match, $specificity); |
1473 | |
1565 | |
1474 | for my $region (list) { |
1566 | for my $region (list) { |
1475 | if ($region->match && $path =~ $region->match) { |
1567 | if ($region->{match} && $path =~ $region->{match}) { |
1476 | ($match, $specificity) = ($region, $region->specificity) |
1568 | ($match, $specificity) = ($region, $region->specificity) |
1477 | if $region->specificity > $specificity; |
1569 | if $region->specificity > $specificity; |
1478 | } |
1570 | } |
1479 | } |
1571 | } |
1480 | |
1572 | |
… | |
… | |
1600 | $self->init; # pass $1 etc. |
1692 | $self->init; # pass $1 etc. |
1601 | return $self; |
1693 | return $self; |
1602 | } |
1694 | } |
1603 | } |
1695 | } |
1604 | |
1696 | |
1605 | Carp::carp "unable to resolve path '$path' (base '$base')."; |
1697 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1606 | () |
1698 | () |
1607 | } |
1699 | } |
1608 | |
1700 | |
1609 | sub init { |
1701 | sub init { |
1610 | my ($self) = @_; |
1702 | my ($self) = @_; |
… | |
… | |
1888 | |
1980 | |
1889 | undef $MAP_PREFETCH{$path}; |
1981 | undef $MAP_PREFETCH{$path}; |
1890 | $MAP_PREFETCHER ||= cf::async { |
1982 | $MAP_PREFETCHER ||= cf::async { |
1891 | while (%MAP_PREFETCH) { |
1983 | while (%MAP_PREFETCH) { |
1892 | for my $path (keys %MAP_PREFETCH) { |
1984 | for my $path (keys %MAP_PREFETCH) { |
1893 | my $map = find $path |
1985 | if (my $map = find $path) { |
1894 | or next; |
|
|
1895 | $map->load; |
1986 | $map->load; |
|
|
1987 | } |
1896 | |
1988 | |
1897 | delete $MAP_PREFETCH{$path}; |
1989 | delete $MAP_PREFETCH{$path}; |
1898 | } |
1990 | } |
1899 | } |
1991 | } |
1900 | undef $MAP_PREFETCHER; |
1992 | undef $MAP_PREFETCHER; |
… | |
… | |
2237 | |
2329 | |
2238 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2330 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2239 | $self->enter_map ($map, $x, $y); |
2331 | $self->enter_map ($map, $x, $y); |
2240 | } |
2332 | } |
2241 | |
2333 | |
2242 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
2334 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2243 | |
2335 | |
2244 | Moves the player to the given map-path and coordinates by first freezing |
2336 | Moves the player to the given map-path and coordinates by first freezing |
2245 | her, loading and preparing them map, calling the provided $check callback |
2337 | her, loading and preparing them map, calling the provided $check callback |
2246 | that has to return the map if sucecssful, and then unfreezes the player on |
2338 | that has to return the map if sucecssful, and then unfreezes the player on |
2247 | the new (success) or old (failed) map position. |
2339 | the new (success) or old (failed) map position. In either case, $done will |
|
|
2340 | be called at the end of this process. |
2248 | |
2341 | |
2249 | =cut |
2342 | =cut |
2250 | |
2343 | |
2251 | our $GOTOGEN; |
2344 | our $GOTOGEN; |
2252 | |
2345 | |
2253 | sub cf::object::player::goto { |
2346 | sub cf::object::player::goto { |
2254 | my ($self, $path, $x, $y, $check) = @_; |
2347 | my ($self, $path, $x, $y, $check, $done) = @_; |
2255 | |
2348 | |
2256 | # 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 |
2257 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2350 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2258 | |
2351 | |
2259 | $self->enter_link; |
2352 | $self->enter_link; |
… | |
… | |
2279 | |
2372 | |
2280 | if ($gen == $self->{_goto_generation}) { |
2373 | if ($gen == $self->{_goto_generation}) { |
2281 | delete $self->{_goto_generation}; |
2374 | delete $self->{_goto_generation}; |
2282 | $self->leave_link ($map, $x, $y); |
2375 | $self->leave_link ($map, $x, $y); |
2283 | } |
2376 | } |
|
|
2377 | |
|
|
2378 | $done->() if $done; |
2284 | })->prio (1); |
2379 | })->prio (1); |
2285 | } |
2380 | } |
2286 | |
2381 | |
2287 | =item $player_object->enter_exit ($exit_object) |
2382 | =item $player_object->enter_exit ($exit_object) |
2288 | |
2383 | |
… | |
… | |
2397 | |
2492 | |
2398 | utf8::encode $text; |
2493 | utf8::encode $text; |
2399 | $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); |
2400 | } |
2495 | } |
2401 | |
2496 | |
2402 | =item $client->send_msg ($color, $type, $msg, [extra...]) |
2497 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
2403 | |
2498 | |
2404 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2499 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2405 | client if neccessary. C<$type> should be a string identifying the type of |
2500 | client if neccessary. C<$type> should be a string identifying the type of |
2406 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2501 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2407 | the message unless the client supports the msg packet. |
2502 | the message unless the client supports the msg packet. |
2408 | |
2503 | |
2409 | =cut |
2504 | =cut |
2410 | |
2505 | |
2411 | sub cf::client::send_msg { |
2506 | sub cf::client::send_msg { |
2412 | my ($self, $color, $type, $msg, @extra) = @_; |
2507 | my ($self, $channel, $msg, $color, @extra) = @_; |
2413 | |
2508 | |
2414 | $msg = $self->pl->expand_cfpod ($msg); |
2509 | $msg = $self->pl->expand_cfpod ($msg); |
2415 | |
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 | |
2416 | return unless @extra || length $msg; |
2523 | return unless @extra || length $msg; |
2417 | |
2524 | |
2418 | if ($self->can_msg) { |
2525 | if ($self->can_msg) { |
2419 | $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); |
2526 | $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); |
2420 | } else { |
2527 | } else { |
2421 | # replace some tags by gcfclient-compatible ones |
2528 | # replace some tags by gcfclient-compatible ones |
2422 | for ($msg) { |
2529 | for ($msg) { |
2423 | 1 while |
2530 | 1 while |
2424 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
2531 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
… | |
… | |
2445 | |
2552 | |
2446 | =cut |
2553 | =cut |
2447 | |
2554 | |
2448 | sub cf::client::ext_event($$%) { |
2555 | sub cf::client::ext_event($$%) { |
2449 | my ($self, $type, %msg) = @_; |
2556 | my ($self, $type, %msg) = @_; |
|
|
2557 | |
|
|
2558 | return unless $self->extcmd; |
2450 | |
2559 | |
2451 | $msg{msgtype} = "event_$type"; |
2560 | $msg{msgtype} = "event_$type"; |
2452 | $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); |
2561 | $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); |
2453 | } |
2562 | } |
2454 | |
2563 | |
… | |
… | |
2701 | { |
2810 | { |
2702 | my $faces = $facedata->{faceinfo}; |
2811 | my $faces = $facedata->{faceinfo}; |
2703 | |
2812 | |
2704 | while (my ($face, $info) = each %$faces) { |
2813 | while (my ($face, $info) = each %$faces) { |
2705 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2814 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2706 | cf::face::set $idx, $info->{visibility}, $info->{magicmap}; |
2815 | cf::face::set_visibility $idx, $info->{visibility}; |
|
|
2816 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2707 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2817 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2708 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2818 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2709 | Coro::cede; |
2819 | |
|
|
2820 | cf::cede_to_tick; |
2710 | } |
2821 | } |
2711 | |
2822 | |
2712 | while (my ($face, $info) = each %$faces) { |
2823 | while (my ($face, $info) = each %$faces) { |
2713 | next unless $info->{smooth}; |
2824 | next unless $info->{smooth}; |
2714 | my $idx = cf::face::find $face |
2825 | my $idx = cf::face::find $face |
2715 | or next; |
2826 | or next; |
2716 | if (my $smooth = cf::face::find $info->{smooth}) { |
2827 | if (my $smooth = cf::face::find $info->{smooth}) { |
|
|
2828 | cf::face::set_smooth $idx, $smooth; |
2717 | cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; |
2829 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
2718 | } else { |
2830 | } else { |
2719 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2831 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2720 | } |
2832 | } |
2721 | Coro::cede; |
2833 | |
|
|
2834 | cf::cede_to_tick; |
2722 | } |
2835 | } |
2723 | } |
2836 | } |
2724 | |
2837 | |
2725 | { |
2838 | { |
2726 | my $anims = $facedata->{animinfo}; |
2839 | my $anims = $facedata->{animinfo}; |
2727 | |
2840 | |
2728 | while (my ($anim, $info) = each %$anims) { |
2841 | while (my ($anim, $info) = each %$anims) { |
2729 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
2842 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
2730 | Coro::cede; |
2843 | cf::cede_to_tick; |
2731 | } |
2844 | } |
2732 | |
2845 | |
2733 | 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 | } |
2734 | } |
2877 | } |
2735 | |
2878 | |
2736 | 1 |
2879 | 1 |
2737 | } |
2880 | } |
2738 | |
2881 | |
2739 | sub reload_regions { |
2882 | sub reload_regions { |
2740 | load_resource_file "$MAPDIR/regions" |
2883 | load_resource_file "$MAPDIR/regions" |
2741 | 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 | } |
2742 | } |
2890 | } |
2743 | |
2891 | |
2744 | sub reload_facedata { |
2892 | sub reload_facedata { |
2745 | load_facedata "$DATADIR/facedata" |
2893 | load_facedata "$DATADIR/facedata" |
2746 | or die "unable to load facedata\n"; |
2894 | or die "unable to load facedata\n"; |