… | |
… | |
58 | use BDB (); |
58 | use BDB (); |
59 | use Data::Dumper; |
59 | use Data::Dumper; |
60 | use Fcntl; |
60 | use Fcntl; |
61 | use YAML::XS (); |
61 | use YAML::XS (); |
62 | use IO::AIO (); |
62 | use IO::AIO (); |
63 | use Time::HiRes; |
|
|
64 | use Compress::LZF; |
63 | use Compress::LZF; |
65 | use Digest::MD5 (); |
64 | use Digest::MD5 (); |
66 | |
65 | |
67 | AnyEvent::detect; |
66 | AnyEvent::detect; |
68 | |
67 | |
… | |
… | |
87 | our %COMMAND = (); |
86 | our %COMMAND = (); |
88 | our %COMMAND_TIME = (); |
87 | our %COMMAND_TIME = (); |
89 | |
88 | |
90 | our @EXTS = (); # list of extension package names |
89 | our @EXTS = (); # list of extension package names |
91 | our %EXTCMD = (); |
90 | our %EXTCMD = (); |
|
|
91 | our %EXTACMD = (); |
92 | our %EXTICMD = (); |
92 | our %EXTICMD = (); |
|
|
93 | our %EXTIACMD = (); |
93 | our %EXT_CORO = (); # coroutines bound to extensions |
94 | our %EXT_CORO = (); # coroutines bound to extensions |
94 | our %EXT_MAP = (); # pluggable maps |
95 | our %EXT_MAP = (); # pluggable maps |
95 | |
96 | |
96 | our $RELOAD; # number of reloads so far, non-zero while in reload |
97 | our $RELOAD; # number of reloads so far, non-zero while in reload |
97 | our @EVENT; |
98 | our @EVENT; |
… | |
… | |
250 | Configuration for the server, loaded from C</etc/deliantra-server/config>, or |
251 | Configuration for the server, loaded from C</etc/deliantra-server/config>, or |
251 | from wherever your confdir points to. |
252 | from wherever your confdir points to. |
252 | |
253 | |
253 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
254 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
254 | |
255 | |
255 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
256 | These are functions that inhibit the current coroutine one tick. |
256 | returns directly I<after> the tick processing (and consequently, can only wake one thread |
257 | cf::wait_for_tick_begin only returns directly I<after> the tick |
|
|
258 | processing (and consequently, can only wake one thread per tick), while |
257 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
259 | cf::wait_for_tick wakes up all waiters after tick processing. |
258 | |
260 | |
259 | Note that cf::Wait_for_tick will immediately return when the server is not |
261 | Note that cf::wait_for_tick will immediately return when the server is not |
260 | ticking, making it suitable for small pauses in threads that need to run |
262 | ticking, making it suitable for small pauses in threads that need to run |
261 | when the server is paused. If that is not applicable (i.e. you I<really> |
263 | when the server is paused. If that is not applicable (i.e. you I<really> |
262 | want to wait, use C<$cf::WAIT_FOR_TICK>). |
264 | want to wait, use C<$cf::WAIT_FOR_TICK>). |
263 | |
265 | |
264 | =item $cf::WAIT_FOR_TICK |
266 | =item $cf::WAIT_FOR_TICK |
… | |
… | |
899 | |
901 | |
900 | return db_get cache => "$id/data"; |
902 | return db_get cache => "$id/data"; |
901 | } |
903 | } |
902 | } |
904 | } |
903 | |
905 | |
904 | my $t1 = Time::HiRes::time; |
906 | my $t1 = EV::time; |
905 | my $data = $process->(\@data); |
907 | my $data = $process->(\@data); |
906 | my $t2 = Time::HiRes::time; |
908 | my $t2 = EV::time; |
907 | |
909 | |
908 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
910 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
909 | |
911 | |
910 | db_put cache => "$id/data", $data; |
912 | db_put cache => "$id/data", $data; |
911 | db_put cache => "$id/md5" , $md5; |
913 | db_put cache => "$id/md5" , $md5; |
… | |
… | |
1431 | =cut |
1433 | =cut |
1432 | |
1434 | |
1433 | ############################################################################# |
1435 | ############################################################################# |
1434 | # command handling &c |
1436 | # command handling &c |
1435 | |
1437 | |
1436 | =item cf::register_command $name => \&callback($ob,$args); |
1438 | =item cf::register_command $name => \&callback($ob,$args) |
1437 | |
1439 | |
1438 | Register a callback for execution when the client sends the user command |
1440 | Register a callback for execution when the client sends the user command |
1439 | $name. |
1441 | $name. |
1440 | |
1442 | |
1441 | =cut |
1443 | =cut |
… | |
… | |
1447 | #warn "registering command '$name/$time' to '$caller'"; |
1449 | #warn "registering command '$name/$time' to '$caller'"; |
1448 | |
1450 | |
1449 | push @{ $COMMAND{$name} }, [$caller, $cb]; |
1451 | push @{ $COMMAND{$name} }, [$caller, $cb]; |
1450 | } |
1452 | } |
1451 | |
1453 | |
1452 | =item cf::register_extcmd $name => \&callback($pl,$packet); |
1454 | =item cf::register_extcmd $name => \&callback($pl,@args) |
1453 | |
1455 | |
1454 | Register a callback for execution when the client sends an (synchronous) |
1456 | Register a callback for execution when the client sends an (synchronous) |
1455 | extcmd packet. Ext commands will be processed in the order they are |
1457 | extcmd packet. Ext commands will be processed in the order they are |
1456 | received by the server, like other user commands. The first argument is |
1458 | received by the server, like other user commands. The first argument is |
1457 | the logged-in player. Ext commands can only be processed after a player |
1459 | the logged-in player. Ext commands can only be processed after a player |
1458 | has logged in successfully. |
1460 | has logged in successfully. |
1459 | |
1461 | |
1460 | If the callback returns something, it is sent back as if reply was being |
1462 | The values will be sent back to the client. |
1461 | called. |
|
|
1462 | |
1463 | |
|
|
1464 | =item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args) |
|
|
1465 | |
|
|
1466 | Same as C<cf::register_extcmd>, but instead of returning values, the |
|
|
1467 | callback needs to clal the C<$reply> function. |
|
|
1468 | |
1463 | =item cf::register_exticmd $name => \&callback($ns,$packet); |
1469 | =item cf::register_exticmd $name => \&callback($ns,@args) |
1464 | |
1470 | |
1465 | Register a callback for execution when the client sends an (asynchronous) |
1471 | Register a callback for execution when the client sends an (asynchronous) |
1466 | exticmd packet. Exti commands are processed by the server as soon as they |
1472 | exticmd packet. Exti commands are processed by the server as soon as they |
1467 | are received, i.e. out of order w.r.t. other commands. The first argument |
1473 | are received, i.e. out of order w.r.t. other commands. The first argument |
1468 | is a client socket. Exti commands can be received anytime, even before |
1474 | is a client socket. Exti commands can be received anytime, even before |
1469 | log-in. |
1475 | log-in. |
1470 | |
1476 | |
1471 | If the callback returns something, it is sent back as if reply was being |
1477 | The values will be sent back to the client. |
1472 | called. |
|
|
1473 | |
1478 | |
1474 | =cut |
1479 | =item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args) |
1475 | |
1480 | |
|
|
1481 | Same as C<cf::register_extcmd>, but instead of returning values, the |
|
|
1482 | callback needs to clal the C<$reply> function. |
|
|
1483 | |
|
|
1484 | =cut |
|
|
1485 | |
1476 | sub register_extcmd { |
1486 | sub register_extcmd($$) { |
1477 | my ($name, $cb) = @_; |
1487 | my ($name, $cb) = @_; |
1478 | |
1488 | |
1479 | $EXTCMD{$name} = $cb; |
1489 | $EXTCMD{$name} = $cb; |
1480 | } |
1490 | } |
1481 | |
1491 | |
1482 | sub register_exticmd { |
1492 | sub register_async_extcmd($$) { |
1483 | my ($name, $cb) = @_; |
1493 | my ($name, $cb) = @_; |
1484 | |
1494 | |
|
|
1495 | $EXTACMD{$name} = $cb; |
|
|
1496 | } |
|
|
1497 | |
|
|
1498 | sub register_exticmd($$) { |
|
|
1499 | my ($name, $cb) = @_; |
|
|
1500 | |
1485 | $EXTICMD{$name} = $cb; |
1501 | $EXTICMD{$name} = $cb; |
|
|
1502 | } |
|
|
1503 | |
|
|
1504 | sub register_async_exticmd($$) { |
|
|
1505 | my ($name, $cb) = @_; |
|
|
1506 | |
|
|
1507 | $EXTIACMD{$name} = $cb; |
1486 | } |
1508 | } |
1487 | |
1509 | |
1488 | use File::Glob (); |
1510 | use File::Glob (); |
1489 | |
1511 | |
1490 | cf::player->attach ( |
1512 | cf::player->attach ( |
… | |
… | |
1506 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1528 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
1507 | |
1529 | |
1508 | if (ref $msg) { |
1530 | if (ref $msg) { |
1509 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
1531 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
1510 | |
1532 | |
1511 | my @reply; |
|
|
1512 | |
|
|
1513 | if (my $cb = $EXTCMD{$type}) { |
1533 | if (my $cb = $EXTACMD{$type}) { |
|
|
1534 | $cb->( |
|
|
1535 | $pl, |
|
|
1536 | sub { |
|
|
1537 | $pl->ext_msg ("reply-$reply", @_) |
|
|
1538 | if $reply; |
|
|
1539 | }, |
|
|
1540 | @payload |
|
|
1541 | ); |
|
|
1542 | } else { |
|
|
1543 | my @reply; |
|
|
1544 | |
|
|
1545 | if (my $cb = $EXTCMD{$type}) { |
1514 | @reply = $cb->($pl, @payload); |
1546 | @reply = $cb->($pl, @payload); |
|
|
1547 | } |
|
|
1548 | |
|
|
1549 | $pl->ext_msg ("reply-$reply", @reply) |
|
|
1550 | if $reply; |
1515 | } |
1551 | } |
1516 | |
|
|
1517 | $pl->ext_reply ($reply, @reply) |
|
|
1518 | if $reply; |
|
|
1519 | |
1552 | |
1520 | } else { |
1553 | } else { |
1521 | error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1554 | error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1522 | } |
1555 | } |
1523 | |
1556 | |
… | |
… | |
1909 | } |
1942 | } |
1910 | |
1943 | |
1911 | =item $protocol_xml = $player->expand_cfpod ($cfpod) |
1944 | =item $protocol_xml = $player->expand_cfpod ($cfpod) |
1912 | |
1945 | |
1913 | Expand deliantra pod fragments into protocol xml. |
1946 | Expand deliantra pod fragments into protocol xml. |
1914 | |
|
|
1915 | =item $player->ext_reply ($msgid, @msg) |
|
|
1916 | |
|
|
1917 | Sends an ext reply to the player. |
|
|
1918 | |
|
|
1919 | =cut |
|
|
1920 | |
|
|
1921 | sub ext_reply($$@) { |
|
|
1922 | my ($self, $id, @msg) = @_; |
|
|
1923 | |
|
|
1924 | $self->ns->ext_reply ($id, @msg) |
|
|
1925 | } |
|
|
1926 | |
1947 | |
1927 | =item $player->ext_msg ($type, @msg) |
1948 | =item $player->ext_msg ($type, @msg) |
1928 | |
1949 | |
1929 | Sends an ext event to the client. |
1950 | Sends an ext event to the client. |
1930 | |
1951 | |
… | |
… | |
3238 | my ($self, $type, @msg) = @_; |
3259 | my ($self, $type, @msg) = @_; |
3239 | |
3260 | |
3240 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
3261 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
3241 | } |
3262 | } |
3242 | |
3263 | |
3243 | =item $client->ext_reply ($msgid, @msg) |
|
|
3244 | |
|
|
3245 | Sends an ext reply to the client. |
|
|
3246 | |
|
|
3247 | =cut |
|
|
3248 | |
|
|
3249 | sub cf::client::ext_reply($$@) { |
|
|
3250 | my ($self, $id, @msg) = @_; |
|
|
3251 | |
|
|
3252 | $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
3253 | } |
|
|
3254 | |
|
|
3255 | =item $success = $client->query ($flags, "text", \&cb) |
3264 | =item $success = $client->query ($flags, "text", \&cb) |
3256 | |
3265 | |
3257 | Queues a query to the client, calling the given callback with |
3266 | Queues a query to the client, calling the given callback with |
3258 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
3267 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
3259 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
3268 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
… | |
… | |
3314 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
3323 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
3315 | |
3324 | |
3316 | if (ref $msg) { |
3325 | if (ref $msg) { |
3317 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
3326 | my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash |
3318 | |
3327 | |
3319 | my @reply; |
|
|
3320 | |
|
|
3321 | if (my $cb = $EXTICMD{$type}) { |
3328 | if (my $cb = $EXTIACMD{$type}) { |
|
|
3329 | $cb->( |
|
|
3330 | $ns, |
|
|
3331 | sub { |
|
|
3332 | $ns->ext_msg ("reply-$reply", @_) |
|
|
3333 | if $reply; |
|
|
3334 | }, |
|
|
3335 | @payload |
|
|
3336 | ); |
|
|
3337 | } else { |
|
|
3338 | my @reply; |
|
|
3339 | |
|
|
3340 | if (my $cb = $EXTICMD{$type}) { |
3322 | @reply = $cb->($ns, @payload); |
3341 | @reply = $cb->($ns, @payload); |
|
|
3342 | } |
|
|
3343 | |
|
|
3344 | $ns->ext_msg ("reply-$reply", @reply) |
|
|
3345 | if $reply; |
3323 | } |
3346 | } |
3324 | |
|
|
3325 | $ns->ext_reply ($reply, @reply) |
|
|
3326 | if $reply; |
|
|
3327 | |
|
|
3328 | } else { |
3347 | } else { |
3329 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3348 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3330 | } |
3349 | } |
3331 | |
3350 | |
3332 | cf::override; |
3351 | cf::override; |
… | |
… | |
3501 | |
3520 | |
3502 | ############################################################################# |
3521 | ############################################################################# |
3503 | # the server's init and main functions |
3522 | # the server's init and main functions |
3504 | |
3523 | |
3505 | our %FACEHASH; # hash => idx, #d# HACK for http server |
3524 | our %FACEHASH; # hash => idx, #d# HACK for http server |
|
|
3525 | our @FACEDATA; # dynamically-created facedata |
3506 | |
3526 | |
3507 | # internal api, not fianlised |
3527 | # internal api, not fianlised |
3508 | sub add_face { |
3528 | sub set_face { |
3509 | my ($name, $type, $data) = @_; |
3529 | my ($name, $type, $data) = @_; |
3510 | |
3530 | |
3511 | my $idx = cf::face::find $name; |
3531 | my $idx = cf::face::find $name; |
3512 | |
3532 | |
3513 | if ($idx) { |
3533 | if ($idx) { |
… | |
… | |
3517 | } |
3537 | } |
3518 | |
3538 | |
3519 | my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; |
3539 | my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; |
3520 | |
3540 | |
3521 | cf::face::set_type $idx, $type; |
3541 | cf::face::set_type $idx, $type; |
3522 | cf::face::set_data $idx, 0, $data, $hash; |
3542 | cf::face::set_data $idx, 0, (length $data), 0, $hash; |
3523 | cf::face::set_meta $idx, $type & 1 ? undef : undef; |
3543 | cf::face::set_meta $idx, $type & 1 ? undef : undef; |
|
|
3544 | |
|
|
3545 | # we need to destroy the SV itself, not just overwrite, |
|
|
3546 | # as a running ix might hold a reference to it. |
|
|
3547 | # delete achieves that. |
|
|
3548 | delete $FACEDATA[$idx]; |
|
|
3549 | $FACEDATA[$idx] = $data; |
3524 | $FACEHASH{$hash} = $idx;#d# |
3550 | $FACEHASH{$hash} = $idx;#d# |
3525 | |
3551 | |
3526 | $idx |
3552 | $idx |
|
|
3553 | } |
|
|
3554 | |
|
|
3555 | our $FACEDATA; # facedata filehandle |
|
|
3556 | |
|
|
3557 | sub _face_get_data($$$$) { |
|
|
3558 | my ($idx, $size, $fofs, $cb) = @_; |
|
|
3559 | |
|
|
3560 | if (defined $FACEDATA[$idx]) { |
|
|
3561 | $cb->($FACEDATA[$idx]); |
|
|
3562 | } elsif ($fofs) { |
|
|
3563 | my $buf; |
|
|
3564 | IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub { |
|
|
3565 | if ($_[0] == $size) { |
|
|
3566 | #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d# |
|
|
3567 | $cb->($buf); |
|
|
3568 | } else { |
|
|
3569 | cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request."; |
|
|
3570 | } |
|
|
3571 | }; |
|
|
3572 | } else { |
|
|
3573 | cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring."; |
|
|
3574 | } |
|
|
3575 | } |
|
|
3576 | |
|
|
3577 | # rather ineffient |
|
|
3578 | sub cf::face::get_data($;$) { |
|
|
3579 | my ($idx, $faceset) = @_; |
|
|
3580 | |
|
|
3581 | my $size = cf::face::get_size $idx, $faceset; |
|
|
3582 | my $fofs = cf::face::get_fofs $idx, $faceset; |
|
|
3583 | |
|
|
3584 | _face_get_data $idx, $size, $fofs, Coro::rouse_cb; |
|
|
3585 | Coro::rouse_wait |
|
|
3586 | } |
|
|
3587 | |
|
|
3588 | sub cf::face::ix { |
|
|
3589 | my ($ns, $idx, $pri, $size, $fofs) = @_; |
|
|
3590 | |
|
|
3591 | _face_get_data $idx, $size, $fofs, sub { |
|
|
3592 | $ns->ix_send ($idx, $pri, $_[0]); |
|
|
3593 | }; |
3527 | } |
3594 | } |
3528 | |
3595 | |
3529 | sub load_facedata($) { |
3596 | sub load_facedata($) { |
3530 | my ($path) = @_; |
3597 | my ($path) = @_; |
3531 | |
3598 | |
3532 | # HACK to clear player env face cache, we need some signal framework |
|
|
3533 | # for this (global event?) |
|
|
3534 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3535 | |
|
|
3536 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3599 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3537 | |
3600 | |
3538 | trace "loading facedata from $path\n"; |
3601 | trace "loading facedata from $path\n"; |
3539 | |
3602 | |
3540 | my $facedata = decode_storable load_file $path; |
3603 | my $facedata = decode_storable load_file "$path/faceinfo"; |
3541 | |
3604 | |
3542 | $facedata->{version} == 2 |
3605 | $facedata->{version} == 2 |
3543 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3606 | or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed."; |
3544 | |
3607 | |
3545 | cf::cede_to_tick; |
3608 | my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0 |
|
|
3609 | or cf::cleanup "$path/facedata: $!, cnanot proceed."; |
|
|
3610 | |
|
|
3611 | get_slot 1, -100, "load_facedata"; # make sure we get a very big slot |
|
|
3612 | |
|
|
3613 | # BEGIN ATOMIC |
|
|
3614 | # from here on, everything must be atomic - no thread switch allowed |
|
|
3615 | my $t1 = EV::time; |
3546 | |
3616 | |
3547 | { |
3617 | { |
3548 | my $faces = $facedata->{faceinfo}; |
3618 | my $faces = $facedata->{faceinfo}; |
3549 | |
3619 | |
3550 | for my $face (sort keys %$faces) { |
3620 | for my $face (sort keys %$faces) { |
3551 | my $info = $faces->{$face}; |
3621 | my $info = $faces->{$face}; |
3552 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3622 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3553 | |
3623 | |
3554 | cf::face::set_visibility $idx, $info->{visibility}; |
3624 | cf::face::set_visibility $idx, $info->{visibility}; |
3555 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3625 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3556 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3626 | cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32}; |
3557 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3627 | cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64}; |
3558 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3628 | #cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph}; # glyphs no longer downloadable via ix |
3559 | $FACEHASH{$info->{hash64}} = $idx;#d# |
3629 | $FACEHASH{$info->{hash64}} = $idx;#d# |
3560 | |
|
|
3561 | cf::cede_to_tick; |
|
|
3562 | } |
3630 | } |
3563 | |
3631 | |
3564 | while (my ($face, $info) = each %$faces) { |
3632 | while (my ($face, $info) = each %$faces) { |
3565 | next unless $info->{smooth}; |
3633 | next unless $info->{smooth}; |
3566 | |
3634 | |
… | |
… | |
3571 | cf::face::set_smooth $idx, $smooth; |
3639 | cf::face::set_smooth $idx, $smooth; |
3572 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3640 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3573 | } else { |
3641 | } else { |
3574 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3642 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3575 | } |
3643 | } |
3576 | |
|
|
3577 | cf::cede_to_tick; |
|
|
3578 | } |
3644 | } |
3579 | } |
3645 | } |
3580 | |
3646 | |
3581 | { |
3647 | { |
3582 | my $anims = $facedata->{animinfo}; |
3648 | my $anims = $facedata->{animinfo}; |
3583 | |
3649 | |
3584 | while (my ($anim, $info) = each %$anims) { |
3650 | while (my ($anim, $info) = each %$anims) { |
3585 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3651 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3586 | cf::cede_to_tick; |
|
|
3587 | } |
3652 | } |
3588 | |
3653 | |
3589 | cf::anim::invalidate_all; # d'oh |
3654 | cf::anim::invalidate_all; # d'oh |
3590 | } |
3655 | } |
3591 | |
3656 | |
… | |
… | |
3596 | if (defined (my $type = $info->{type})) { |
3661 | if (defined (my $type = $info->{type})) { |
3597 | # TODO: different hash - must free and use new index, or cache ixface data queue |
3662 | # TODO: different hash - must free and use new index, or cache ixface data queue |
3598 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3663 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3599 | |
3664 | |
3600 | cf::face::set_type $idx, $type; |
3665 | cf::face::set_type $idx, $type; |
3601 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3666 | cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash}; |
3602 | cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3667 | cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3603 | $FACEHASH{$info->{hash}} = $idx;#d# |
3668 | $FACEHASH{$info->{hash}} = $idx;#d# |
3604 | } else { |
3669 | } else { |
3605 | # $RESOURCE{$name} = $info; # unused |
3670 | # $RESOURCE{$name} = $info; # unused |
3606 | } |
3671 | } |
3607 | |
|
|
3608 | cf::cede_to_tick; |
|
|
3609 | } |
3672 | } |
3610 | } |
3673 | } |
|
|
3674 | |
|
|
3675 | ($fh, $FACEDATA) = ($FACEDATA, $fh); |
|
|
3676 | |
|
|
3677 | # HACK to clear player env face cache, we need some signal framework |
|
|
3678 | # for this (global event?) |
|
|
3679 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3680 | |
|
|
3681 | # END ATOMIC |
|
|
3682 | |
|
|
3683 | cf::debug "facedata atomic update time ", EV::time - $t1; |
3611 | |
3684 | |
3612 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3685 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
|
|
3686 | |
|
|
3687 | aio_close $fh if $fh; # close old facedata |
3613 | |
3688 | |
3614 | 1 |
3689 | 1 |
3615 | } |
3690 | } |
3616 | |
3691 | |
3617 | register_exticmd fx_want => sub { |
3692 | register_exticmd fx_want => sub { |
… | |
… | |
3633 | } |
3708 | } |
3634 | |
3709 | |
3635 | sub reload_exp_table { |
3710 | sub reload_exp_table { |
3636 | _reload_exp_table; |
3711 | _reload_exp_table; |
3637 | |
3712 | |
3638 | add_face "res/exp_table" => FT_RSRC, |
3713 | set_face "res/exp_table" => FT_RSRC, |
3639 | JSON::XS->new->utf8->canonical->encode ( |
3714 | JSON::XS->new->utf8->canonical->encode ( |
3640 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3715 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3641 | ); |
3716 | ); |
3642 | } |
3717 | } |
3643 | |
3718 | |
… | |
… | |
3658 | if exists $_->{match}; |
3733 | if exists $_->{match}; |
3659 | } |
3734 | } |
3660 | } |
3735 | } |
3661 | |
3736 | |
3662 | sub reload_facedata { |
3737 | sub reload_facedata { |
3663 | load_facedata "$DATADIR/facedata" |
3738 | load_facedata $DATADIR |
3664 | or die "unable to load facedata\n"; |
3739 | or die "unable to load facedata\n"; |
3665 | } |
3740 | } |
3666 | |
3741 | |
3667 | sub reload_archetypes { |
3742 | sub reload_archetypes { |
3668 | load_resource_file "$DATADIR/archetypes" |
3743 | load_resource_file "$DATADIR/archetypes" |
3669 | or die "unable to load archetypes\n"; |
3744 | or die "unable to load archetypes\n"; |
3670 | |
3745 | |
3671 | add_face "res/skill_info" => FT_RSRC, |
3746 | set_face "res/skill_info" => FT_RSRC, |
3672 | JSON::XS->new->utf8->canonical->encode ( |
3747 | JSON::XS->new->utf8->canonical->encode ( |
3673 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3748 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3674 | ); |
3749 | ); |
3675 | add_face "res/spell_paths" => FT_RSRC, |
3750 | set_face "res/spell_paths" => FT_RSRC, |
3676 | JSON::XS->new->utf8->canonical->encode ( |
3751 | JSON::XS->new->utf8->canonical->encode ( |
3677 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3752 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3678 | ); |
3753 | ); |
3679 | } |
3754 | } |
3680 | |
3755 | |
… | |
… | |
3699 | |
3774 | |
3700 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
3775 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
3701 | my $face = cf::face::find "sound/$v"; |
3776 | my $face = cf::face::find "sound/$v"; |
3702 | cf::sound::set $k => $face; |
3777 | cf::sound::set $k => $face; |
3703 | } |
3778 | } |
3704 | } |
|
|
3705 | |
|
|
3706 | #d# move docstuff to help or so |
|
|
3707 | our %DOCSTRING; |
|
|
3708 | |
|
|
3709 | sub reload_pod { |
|
|
3710 | trace "loading pods $PODDIR\n"; |
|
|
3711 | |
|
|
3712 | %DOCSTRING = (); |
|
|
3713 | my @command_list; |
|
|
3714 | |
|
|
3715 | for ( |
|
|
3716 | [0, "command_help"], |
|
|
3717 | [1, "emote_help"], |
|
|
3718 | [2, "dmcommand_help"], |
|
|
3719 | ) { |
|
|
3720 | my ($type, $path) = @$_; |
|
|
3721 | |
|
|
3722 | my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod") |
|
|
3723 | or die "unable to load $path"; |
|
|
3724 | |
|
|
3725 | my $level = 1e9; |
|
|
3726 | my $rpar; |
|
|
3727 | |
|
|
3728 | for my $par (@$paragraphs) { |
|
|
3729 | if ($par->{type} eq "head2") { |
|
|
3730 | # this code taken almost verbatim from DC/Protocol.pm |
|
|
3731 | |
|
|
3732 | if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) { |
|
|
3733 | my $cmd = $1; |
|
|
3734 | my @args = split /\|/, $2; |
|
|
3735 | @args = (".*") unless @args; |
|
|
3736 | |
|
|
3737 | $_ = $_ eq ".*" ? "" : " $_" |
|
|
3738 | for @args; |
|
|
3739 | |
|
|
3740 | my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args; |
|
|
3741 | |
|
|
3742 | $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par])); |
|
|
3743 | |
|
|
3744 | push @command_list, [$type, \@variants]; |
|
|
3745 | $level = $par->{level}; |
|
|
3746 | } else { |
|
|
3747 | error "$par->{markup}: unparsable command heading"; |
|
|
3748 | } |
|
|
3749 | } elsif ($par->{level} > $level) { |
|
|
3750 | $$rpar .= &cf::pod::as_cfpod ([$par]); |
|
|
3751 | } |
|
|
3752 | |
|
|
3753 | cf::cede_to_tick; |
|
|
3754 | } |
|
|
3755 | } |
|
|
3756 | |
|
|
3757 | @command_list = sort { |
|
|
3758 | $a->[0] <=> $b->[0] |
|
|
3759 | or $a->[1] cmp $b->[1] |
|
|
3760 | } @command_list; |
|
|
3761 | |
|
|
3762 | cf::cede_to_tick; |
|
|
3763 | |
|
|
3764 | add_face "res/command_list" => FT_RSRC, |
|
|
3765 | JSON::XS->new->utf8->encode (\@command_list); |
|
|
3766 | } |
3779 | } |
3767 | |
3780 | |
3768 | sub reload_resources { |
3781 | sub reload_resources { |
3769 | trace "reloading resource files...\n"; |
3782 | trace "reloading resource files...\n"; |
3770 | |
3783 | |
… | |
… | |
3773 | reload_exp_table; |
3786 | reload_exp_table; |
3774 | reload_sound; |
3787 | reload_sound; |
3775 | reload_archetypes; |
3788 | reload_archetypes; |
3776 | reload_regions; |
3789 | reload_regions; |
3777 | reload_treasures; |
3790 | reload_treasures; |
3778 | reload_pod; |
|
|
3779 | |
3791 | |
3780 | trace "finished reloading resource files\n"; |
3792 | trace "finished reloading resource files\n"; |
3781 | } |
3793 | } |
3782 | |
3794 | |
3783 | sub reload_config { |
3795 | sub reload_config { |