… | |
… | |
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 | |
… | |
… | |
248 | |
255 | |
249 | Converts a perl data structure into its JSON representation. |
256 | Converts a perl data structure into its JSON representation. |
250 | |
257 | |
251 | =cut |
258 | =cut |
252 | |
259 | |
253 | our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max |
260 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
254 | |
261 | |
255 | sub to_json ($) { $json_coder->encode ($_[0]) } |
262 | sub to_json ($) { $json_coder->encode ($_[0]) } |
256 | sub from_json ($) { $json_coder->decode ($_[0]) } |
263 | sub from_json ($) { $json_coder->decode ($_[0]) } |
257 | |
264 | |
258 | =item cf::lock_wait $string |
265 | =item cf::lock_wait $string |
… | |
… | |
409 | Coro::Storable. May, of course, block. Note that the executed sub may |
416 | Coro::Storable. May, of course, block. Note that the executed sub may |
410 | never block itself or use any form of Event handling. |
417 | never block itself or use any form of Event handling. |
411 | |
418 | |
412 | =cut |
419 | =cut |
413 | |
420 | |
|
|
421 | sub _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 | |
414 | sub fork_call(&@) { |
430 | sub 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 | |
851 | our $override; |
876 | our $override; |
852 | our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
877 | our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
853 | |
878 | |
854 | sub override { |
879 | sub override { |
855 | $override = 1; |
880 | $override = 1; |
856 | @invoke_results = (); |
881 | @INVOKE_RESULTS = (@_); |
857 | } |
882 | } |
858 | |
883 | |
859 | sub do_invoke { |
884 | sub 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 | |
886 | Generate an object-specific event with the given arguments. |
911 | Generate an object-specific event with the given arguments. |
887 | |
912 | |
888 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
913 | 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 |
914 | removed in future versions), and there is no public API to access override |
890 | results (if you must, access C<@cf::invoke_results> directly). |
915 | results (if you must, access C<@cf::INVOKE_RESULTS> directly). |
891 | |
916 | |
892 | =back |
917 | =back |
893 | |
918 | |
894 | =cut |
919 | =cut |
895 | |
920 | |
… | |
… | |
1086 | cf::override; |
1111 | cf::override; |
1087 | }, |
1112 | }, |
1088 | on_extcmd => sub { |
1113 | on_extcmd => sub { |
1089 | my ($pl, $buf) = @_; |
1114 | my ($pl, $buf) = @_; |
1090 | |
1115 | |
1091 | my $msg = eval { from_json $buf }; |
1116 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1092 | |
1117 | |
1093 | if (ref $msg) { |
1118 | if (ref $msg) { |
1094 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1119 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1095 | if (my %reply = $cb->($pl, $msg)) { |
1120 | if (my %reply = $cb->($pl, $msg)) { |
1096 | $pl->ext_reply ($msg->{msgid}, %reply); |
1121 | $pl->ext_reply ($msg->{msgid}, %reply); |
… | |
… | |
1400 | # replace G<male|female> tags |
1425 | # replace G<male|female> tags |
1401 | || s{G<([^>|]*)\|([^>]*)>}{ |
1426 | || s{G<([^>|]*)\|([^>]*)>}{ |
1402 | $self->gender ? $2 : $1 |
1427 | $self->gender ? $2 : $1 |
1403 | }ge |
1428 | }ge |
1404 | # replace H<hint text> |
1429 | # replace H<hint text> |
1405 | || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; |
1430 | || s{H<([^\>]*)>} |
|
|
1431 | { |
|
|
1432 | ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", |
|
|
1433 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
|
|
1434 | "") |
|
|
1435 | [$self->{hintmode}] |
|
|
1436 | }ge; |
1406 | |
1437 | |
1407 | # create single paragraphs (very hackish) |
1438 | # create single paragraphs (very hackish) |
1408 | s/(?<=\S)\n(?=\w)/ /g; |
1439 | s/(?<=\S)\n(?=\w)/ /g; |
1409 | |
1440 | |
|
|
1441 | # compress some whitespace |
|
|
1442 | s/\s+\n/\n/g; # ws line-ends |
|
|
1443 | s/\n\n+/\n/g; # double lines |
|
|
1444 | s/^\n+//; # beginning lines |
|
|
1445 | s/\n+$//; # ending lines |
|
|
1446 | |
1410 | $_ |
1447 | $_ |
|
|
1448 | } |
|
|
1449 | |
|
|
1450 | sub hintmode { |
|
|
1451 | $_[0]{hintmode} = $_[1] if @_ > 1; |
|
|
1452 | $_[0]{hintmode} |
1411 | } |
1453 | } |
1412 | |
1454 | |
1413 | =item $player->ext_reply ($msgid, %msg) |
1455 | =item $player->ext_reply ($msgid, %msg) |
1414 | |
1456 | |
1415 | Sends an ext reply to the player. |
1457 | Sends an ext reply to the player. |
… | |
… | |
1418 | |
1460 | |
1419 | sub ext_reply($$%) { |
1461 | sub ext_reply($$%) { |
1420 | my ($self, $id, %msg) = @_; |
1462 | my ($self, $id, %msg) = @_; |
1421 | |
1463 | |
1422 | $msg{msgid} = $id; |
1464 | $msg{msgid} = $id; |
1423 | $self->send ("ext " . cf::to_json \%msg); |
1465 | $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); |
1424 | } |
1466 | } |
1425 | |
1467 | |
1426 | =item $player->ext_event ($type, %msg) |
1468 | =item $player->ext_event ($type, %msg) |
1427 | |
1469 | |
1428 | Sends an ext event to the client. |
1470 | Sends an ext event to the client. |
… | |
… | |
1453 | my ($path) = @_; |
1495 | my ($path) = @_; |
1454 | |
1496 | |
1455 | my ($match, $specificity); |
1497 | my ($match, $specificity); |
1456 | |
1498 | |
1457 | for my $region (list) { |
1499 | for my $region (list) { |
1458 | if ($region->match && $path =~ $region->match) { |
1500 | if ($region->{match} && $path =~ $region->{match}) { |
1459 | ($match, $specificity) = ($region, $region->specificity) |
1501 | ($match, $specificity) = ($region, $region->specificity) |
1460 | if $region->specificity > $specificity; |
1502 | if $region->specificity > $specificity; |
1461 | } |
1503 | } |
1462 | } |
1504 | } |
1463 | |
1505 | |
… | |
… | |
1583 | $self->init; # pass $1 etc. |
1625 | $self->init; # pass $1 etc. |
1584 | return $self; |
1626 | return $self; |
1585 | } |
1627 | } |
1586 | } |
1628 | } |
1587 | |
1629 | |
1588 | Carp::carp "unable to resolve path '$path' (base '$base')."; |
1630 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1589 | () |
1631 | () |
1590 | } |
1632 | } |
1591 | |
1633 | |
1592 | sub init { |
1634 | sub init { |
1593 | my ($self) = @_; |
1635 | my ($self) = @_; |
… | |
… | |
1871 | |
1913 | |
1872 | undef $MAP_PREFETCH{$path}; |
1914 | undef $MAP_PREFETCH{$path}; |
1873 | $MAP_PREFETCHER ||= cf::async { |
1915 | $MAP_PREFETCHER ||= cf::async { |
1874 | while (%MAP_PREFETCH) { |
1916 | while (%MAP_PREFETCH) { |
1875 | for my $path (keys %MAP_PREFETCH) { |
1917 | for my $path (keys %MAP_PREFETCH) { |
1876 | my $map = find $path |
1918 | if (my $map = find $path) { |
1877 | or next; |
|
|
1878 | $map->load; |
1919 | $map->load; |
|
|
1920 | } |
1879 | |
1921 | |
1880 | delete $MAP_PREFETCH{$path}; |
1922 | delete $MAP_PREFETCH{$path}; |
1881 | } |
1923 | } |
1882 | } |
1924 | } |
1883 | undef $MAP_PREFETCHER; |
1925 | undef $MAP_PREFETCHER; |
… | |
… | |
2220 | |
2262 | |
2221 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2263 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2222 | $self->enter_map ($map, $x, $y); |
2264 | $self->enter_map ($map, $x, $y); |
2223 | } |
2265 | } |
2224 | |
2266 | |
2225 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
2267 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2226 | |
2268 | |
2227 | Moves the player to the given map-path and coordinates by first freezing |
2269 | Moves the player to the given map-path and coordinates by first freezing |
2228 | her, loading and preparing them map, calling the provided $check callback |
2270 | her, loading and preparing them map, calling the provided $check callback |
2229 | that has to return the map if sucecssful, and then unfreezes the player on |
2271 | that has to return the map if sucecssful, and then unfreezes the player on |
2230 | the new (success) or old (failed) map position. |
2272 | the new (success) or old (failed) map position. In either case, $done will |
|
|
2273 | be called at the end of this process. |
2231 | |
2274 | |
2232 | =cut |
2275 | =cut |
2233 | |
2276 | |
2234 | our $GOTOGEN; |
2277 | our $GOTOGEN; |
2235 | |
2278 | |
2236 | sub cf::object::player::goto { |
2279 | sub cf::object::player::goto { |
2237 | my ($self, $path, $x, $y, $check) = @_; |
2280 | my ($self, $path, $x, $y, $check, $done) = @_; |
2238 | |
2281 | |
2239 | # do generation counting so two concurrent goto's will be executed in-order |
2282 | # do generation counting so two concurrent goto's will be executed in-order |
2240 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2283 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2241 | |
2284 | |
2242 | $self->enter_link; |
2285 | $self->enter_link; |
… | |
… | |
2262 | |
2305 | |
2263 | if ($gen == $self->{_goto_generation}) { |
2306 | if ($gen == $self->{_goto_generation}) { |
2264 | delete $self->{_goto_generation}; |
2307 | delete $self->{_goto_generation}; |
2265 | $self->leave_link ($map, $x, $y); |
2308 | $self->leave_link ($map, $x, $y); |
2266 | } |
2309 | } |
|
|
2310 | |
|
|
2311 | $done->() if $done; |
2267 | })->prio (1); |
2312 | })->prio (1); |
2268 | } |
2313 | } |
2269 | |
2314 | |
2270 | =item $player_object->enter_exit ($exit_object) |
2315 | =item $player_object->enter_exit ($exit_object) |
2271 | |
2316 | |
… | |
… | |
2340 | my $hp = $exit->stats->hp; |
2385 | my $hp = $exit->stats->hp; |
2341 | my $sp = $exit->stats->sp; |
2386 | my $sp = $exit->stats->sp; |
2342 | |
2387 | |
2343 | $self->enter_link; |
2388 | $self->enter_link; |
2344 | |
2389 | |
|
|
2390 | # if exit is damned, update players death & WoR home-position |
|
|
2391 | $self->contr->savebed ($slaying, $hp, $sp) |
|
|
2392 | if $exit->flag (FLAG_DAMNED); |
|
|
2393 | |
2345 | (async { |
2394 | (async { |
2346 | $self->deactivate_recursive; # just to be sure |
2395 | $self->deactivate_recursive; # just to be sure |
2347 | unless (eval { |
2396 | unless (eval { |
2348 | $self->goto ($slaying, $hp, $sp); |
2397 | $self->goto ($slaying, $hp, $sp); |
2349 | |
2398 | |
… | |
… | |
2390 | sub cf::client::send_msg { |
2439 | sub cf::client::send_msg { |
2391 | my ($self, $color, $type, $msg, @extra) = @_; |
2440 | my ($self, $color, $type, $msg, @extra) = @_; |
2392 | |
2441 | |
2393 | $msg = $self->pl->expand_cfpod ($msg); |
2442 | $msg = $self->pl->expand_cfpod ($msg); |
2394 | |
2443 | |
|
|
2444 | return unless @extra || length $msg; |
|
|
2445 | |
2395 | if ($self->can_msg) { |
2446 | if ($self->can_msg) { |
2396 | $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); |
2447 | $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); |
2397 | } else { |
2448 | } else { |
2398 | # replace some tags by gcfclient-compatible ones |
2449 | # replace some tags by gcfclient-compatible ones |
2399 | for ($msg) { |
2450 | for ($msg) { |
2400 | 1 while |
2451 | 1 while |
2401 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
2452 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
… | |
… | |
2423 | =cut |
2474 | =cut |
2424 | |
2475 | |
2425 | sub cf::client::ext_event($$%) { |
2476 | sub cf::client::ext_event($$%) { |
2426 | my ($self, $type, %msg) = @_; |
2477 | my ($self, $type, %msg) = @_; |
2427 | |
2478 | |
|
|
2479 | return unless $self->extcmd; |
|
|
2480 | |
2428 | $msg{msgtype} = "event_$type"; |
2481 | $msg{msgtype} = "event_$type"; |
2429 | $self->send_packet ("ext " . cf::to_json \%msg); |
2482 | $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); |
2430 | } |
2483 | } |
2431 | |
2484 | |
2432 | =item $success = $client->query ($flags, "text", \&cb) |
2485 | =item $success = $client->query ($flags, "text", \&cb) |
2433 | |
2486 | |
2434 | Queues a query to the client, calling the given callback with |
2487 | Queues a query to the client, calling the given callback with |
… | |
… | |
2457 | |
2510 | |
2458 | 1 |
2511 | 1 |
2459 | } |
2512 | } |
2460 | |
2513 | |
2461 | cf::client->attach ( |
2514 | cf::client->attach ( |
|
|
2515 | on_connect => sub { |
|
|
2516 | my ($ns) = @_; |
|
|
2517 | |
|
|
2518 | $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed; |
|
|
2519 | }, |
2462 | on_reply => sub { |
2520 | on_reply => sub { |
2463 | my ($ns, $msg) = @_; |
2521 | my ($ns, $msg) = @_; |
2464 | |
2522 | |
2465 | # this weird shuffling is so that direct followup queries |
2523 | # this weird shuffling is so that direct followup queries |
2466 | # get handled first |
2524 | # get handled first |
… | |
… | |
2481 | } |
2539 | } |
2482 | }, |
2540 | }, |
2483 | on_exticmd => sub { |
2541 | on_exticmd => sub { |
2484 | my ($ns, $buf) = @_; |
2542 | my ($ns, $buf) = @_; |
2485 | |
2543 | |
2486 | my $msg = eval { from_json $buf }; |
2544 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
2487 | |
2545 | |
2488 | if (ref $msg) { |
2546 | if (ref $msg) { |
2489 | if (my $cb = $EXTICMD{$msg->{msgtype}}) { |
2547 | if (my $cb = $EXTICMD{$msg->{msgtype}}) { |
2490 | if (my %reply = $cb->($ns, $msg)) { |
2548 | if (my %reply = $cb->($ns, $msg)) { |
2491 | $reply{msgid} = $msg->{msgid}; |
2549 | $reply{msgid} = $msg->{msgid}; |
2492 | $ns->send ("ext " . cf::to_json \%reply); |
2550 | $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); |
2493 | } |
2551 | } |
2494 | } |
2552 | } |
2495 | } else { |
2553 | } else { |
2496 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2554 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2497 | } |
2555 | } |
… | |
… | |
2554 | |
2612 | |
2555 | =pod |
2613 | =pod |
2556 | |
2614 | |
2557 | The following functions and methods are available within a safe environment: |
2615 | The following functions and methods are available within a safe environment: |
2558 | |
2616 | |
2559 | cf::object contr pay_amount pay_player map |
2617 | cf::object |
|
|
2618 | contr pay_amount pay_player map x y force_find force_add |
|
|
2619 | insert remove |
|
|
2620 | |
2560 | cf::object::player player |
2621 | cf::object::player |
2561 | cf::player peaceful |
2622 | player |
2562 | cf::map trigger |
2623 | |
|
|
2624 | cf::player |
|
|
2625 | peaceful |
|
|
2626 | |
|
|
2627 | cf::map |
|
|
2628 | trigger |
2563 | |
2629 | |
2564 | =cut |
2630 | =cut |
2565 | |
2631 | |
2566 | for ( |
2632 | for ( |
2567 | ["cf::object" => qw(contr pay_amount pay_player map)], |
2633 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
|
|
2634 | insert remove)], |
2568 | ["cf::object::player" => qw(player)], |
2635 | ["cf::object::player" => qw(player)], |
2569 | ["cf::player" => qw(peaceful)], |
2636 | ["cf::player" => qw(peaceful)], |
2570 | ["cf::map" => qw(trigger)], |
2637 | ["cf::map" => qw(trigger)], |
2571 | ) { |
2638 | ) { |
2572 | no strict 'refs'; |
2639 | no strict 'refs'; |
… | |
… | |
2664 | { |
2731 | { |
2665 | my $faces = $facedata->{faceinfo}; |
2732 | my $faces = $facedata->{faceinfo}; |
2666 | |
2733 | |
2667 | while (my ($face, $info) = each %$faces) { |
2734 | while (my ($face, $info) = each %$faces) { |
2668 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2735 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2669 | cf::face::set $idx, $info->{visibility}, $info->{magicmap}; |
2736 | cf::face::set_visibility $idx, $info->{visibility}; |
|
|
2737 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2670 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2738 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2671 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2739 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2672 | Coro::cede; |
2740 | |
|
|
2741 | cf::cede_to_tick; |
2673 | } |
2742 | } |
2674 | |
2743 | |
2675 | while (my ($face, $info) = each %$faces) { |
2744 | while (my ($face, $info) = each %$faces) { |
2676 | next unless $info->{smooth}; |
2745 | next unless $info->{smooth}; |
2677 | my $idx = cf::face::find $face |
2746 | my $idx = cf::face::find $face |
2678 | or next; |
2747 | or next; |
2679 | if (my $smooth = cf::face::find $info->{smooth}) { |
2748 | if (my $smooth = cf::face::find $info->{smooth}) { |
|
|
2749 | cf::face::set_smooth $idx, $smooth; |
2680 | cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; |
2750 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
2681 | } else { |
2751 | } else { |
2682 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2752 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2683 | } |
2753 | } |
2684 | Coro::cede; |
2754 | |
|
|
2755 | cf::cede_to_tick; |
2685 | } |
2756 | } |
2686 | } |
2757 | } |
2687 | |
2758 | |
2688 | { |
2759 | { |
2689 | my $anims = $facedata->{animinfo}; |
2760 | my $anims = $facedata->{animinfo}; |
2690 | |
2761 | |
2691 | while (my ($anim, $info) = each %$anims) { |
2762 | while (my ($anim, $info) = each %$anims) { |
2692 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
2763 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
2693 | Coro::cede; |
2764 | cf::cede_to_tick; |
2694 | } |
2765 | } |
2695 | |
2766 | |
2696 | cf::anim::invalidate_all; # d'oh |
2767 | cf::anim::invalidate_all; # d'oh |
|
|
2768 | } |
|
|
2769 | |
|
|
2770 | { |
|
|
2771 | # TODO: for gcfclient pleasure, we should give resources |
|
|
2772 | # that gcfclient doesn't grok a >10000 face index. |
|
|
2773 | my $res = $facedata->{resource}; |
|
|
2774 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2775 | |
|
|
2776 | while (my ($name, $info) = each %$res) { |
|
|
2777 | my $meta = $enc->encode ({ |
|
|
2778 | name => $name, |
|
|
2779 | type => $info->{type}, |
|
|
2780 | copyright => $info->{copyright}, #TODO# |
|
|
2781 | }); |
|
|
2782 | |
|
|
2783 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
2784 | |
|
|
2785 | if ($name =~ /\.jpg$/) { |
|
|
2786 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack |
|
|
2787 | cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack |
|
|
2788 | } else { |
|
|
2789 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
2790 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
|
|
2791 | |
|
|
2792 | cf::face::set_type $idx, 1; |
|
|
2793 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2794 | } |
|
|
2795 | |
|
|
2796 | cf::cede_to_tick; |
|
|
2797 | } |
2697 | } |
2798 | } |
2698 | |
2799 | |
2699 | 1 |
2800 | 1 |
2700 | } |
2801 | } |
2701 | |
2802 | |
2702 | sub reload_regions { |
2803 | sub reload_regions { |
2703 | load_resource_file "$MAPDIR/regions" |
2804 | load_resource_file "$MAPDIR/regions" |
2704 | or die "unable to load regions file\n"; |
2805 | or die "unable to load regions file\n"; |
|
|
2806 | |
|
|
2807 | for (cf::region::list) { |
|
|
2808 | $_->{match} = qr/$_->{match}/ |
|
|
2809 | if exists $_->{match}; |
|
|
2810 | } |
2705 | } |
2811 | } |
2706 | |
2812 | |
2707 | sub reload_facedata { |
2813 | sub reload_facedata { |
2708 | load_facedata "$DATADIR/facedata" |
2814 | load_facedata "$DATADIR/facedata" |
2709 | or die "unable to load facedata\n"; |
2815 | or die "unable to load facedata\n"; |
2710 | } |
2816 | } |
2711 | |
2817 | |
2712 | sub reload_archetypes { |
2818 | sub reload_archetypes { |
|
|
2819 | load_resource_file "$DATADIR/archetypes" |
|
|
2820 | or die "unable to load archetypes\n"; |
|
|
2821 | #d# NEED to laod twice to resolve forward references |
|
|
2822 | # this really needs to be done in an extra post-pass |
|
|
2823 | # (which needs to be synchronous, so solve it differently) |
2713 | load_resource_file "$DATADIR/archetypes" |
2824 | load_resource_file "$DATADIR/archetypes" |
2714 | or die "unable to load archetypes\n"; |
2825 | or die "unable to load archetypes\n"; |
2715 | } |
2826 | } |
2716 | |
2827 | |
2717 | sub reload_treasures { |
2828 | sub reload_treasures { |