… | |
… | |
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 | |
… | |
… | |
252 | 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 |
253 | from wherever your confdir points to. |
252 | from wherever your confdir points to. |
254 | |
253 | |
255 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
254 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
256 | |
255 | |
257 | 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. |
258 | 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 |
259 | 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. |
260 | |
260 | |
261 | 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 |
262 | 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 |
263 | 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> |
264 | want to wait, use C<$cf::WAIT_FOR_TICK>). |
264 | want to wait, use C<$cf::WAIT_FOR_TICK>). |
265 | |
265 | |
266 | =item $cf::WAIT_FOR_TICK |
266 | =item $cf::WAIT_FOR_TICK |
… | |
… | |
573 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
573 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
574 | (default: 0): This call blocks and returns only when you have at least |
574 | (default: 0): This call blocks and returns only when you have at least |
575 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
575 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
576 | till the next cede. |
576 | till the next cede. |
577 | |
577 | |
578 | Background jobs should use a priority les than zero, interactive jobs |
578 | Background jobs should use a priority less than zero, interactive jobs |
579 | should use 100 or more. |
579 | should use 100 or more. |
580 | |
580 | |
581 | The optional C<$name> can be used to identify the job to run. It might be |
581 | The optional C<$name> can be used to identify the job to run. It might be |
582 | used for statistical purposes and should identify the same time-class. |
582 | used for statistical purposes and should identify the same time-class. |
583 | |
583 | |
… | |
… | |
738 | reset_signals; |
738 | reset_signals; |
739 | } |
739 | } |
740 | |
740 | |
741 | sub fork_call(&@) { |
741 | sub fork_call(&@) { |
742 | my ($cb, @args) = @_; |
742 | my ($cb, @args) = @_; |
743 | |
|
|
744 | # we seemingly have to make a local copy of the whole thing, |
|
|
745 | # otherwise perl prematurely frees the stuff :/ |
|
|
746 | # TODO: investigate and fix (likely this will be rather laborious) |
|
|
747 | |
743 | |
748 | my @res = Coro::Util::fork_eval { |
744 | my @res = Coro::Util::fork_eval { |
749 | cf::post_fork; |
745 | cf::post_fork; |
750 | &$cb |
746 | &$cb |
751 | } @args; |
747 | } @args; |
… | |
… | |
901 | |
897 | |
902 | return db_get cache => "$id/data"; |
898 | return db_get cache => "$id/data"; |
903 | } |
899 | } |
904 | } |
900 | } |
905 | |
901 | |
906 | my $t1 = Time::HiRes::time; |
902 | my $t1 = EV::time; |
907 | my $data = $process->(\@data); |
903 | my $data = $process->(\@data); |
908 | my $t2 = Time::HiRes::time; |
904 | my $t2 = EV::time; |
909 | |
905 | |
910 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
906 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
911 | |
907 | |
912 | db_put cache => "$id/data", $data; |
908 | db_put cache => "$id/data", $data; |
913 | db_put cache => "$id/md5" , $md5; |
909 | db_put cache => "$id/md5" , $md5; |
… | |
… | |
2654 | |
2650 | |
2655 | Creates and returns a persistent reference to an object that can be stored as a string. |
2651 | Creates and returns a persistent reference to an object that can be stored as a string. |
2656 | |
2652 | |
2657 | =item $ob = cf::object::deref ($refstring) |
2653 | =item $ob = cf::object::deref ($refstring) |
2658 | |
2654 | |
2659 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
2655 | returns the objetc referenced by refstring. may return undef when it cannot find the object, |
2660 | even if the object actually exists. May block. |
2656 | even if the object actually exists. May block. |
2661 | |
2657 | |
2662 | =cut |
2658 | =cut |
2663 | |
2659 | |
2664 | sub deref { |
2660 | sub deref { |
… | |
… | |
3204 | id => "death", |
3200 | id => "death", |
3205 | title => "Death", |
3201 | title => "Death", |
3206 | reply => undef, |
3202 | reply => undef, |
3207 | tooltip => "Reason for and more info about your most recent death", |
3203 | tooltip => "Reason for and more info about your most recent death", |
3208 | }, |
3204 | }, |
|
|
3205 | "c/fatal" => { |
|
|
3206 | id => "fatal", |
|
|
3207 | title => "Fatal Error", |
|
|
3208 | reply => undef, |
|
|
3209 | tooltip => "Reason for the server disconnect", |
|
|
3210 | }, |
3209 | "c/say" => $SAY_CHANNEL, |
3211 | "c/say" => $SAY_CHANNEL, |
3210 | "c/chat" => $CHAT_CHANNEL, |
3212 | "c/chat" => $CHAT_CHANNEL, |
3211 | ); |
3213 | ); |
3212 | |
3214 | |
3213 | sub cf::client::send_msg { |
3215 | sub cf::client::send_msg { |
… | |
… | |
3519 | =cut |
3521 | =cut |
3520 | |
3522 | |
3521 | ############################################################################# |
3523 | ############################################################################# |
3522 | # the server's init and main functions |
3524 | # the server's init and main functions |
3523 | |
3525 | |
3524 | our %FACEHASH; # hash => idx, #d# HACK for http server |
3526 | { |
|
|
3527 | package cf::face; |
3525 | |
3528 | |
|
|
3529 | our %HASH; # hash => idx |
|
|
3530 | our @DATA; # dynamically-created facedata, only faceste 0 used |
|
|
3531 | our @FOFS; # file offset, if > 0 |
|
|
3532 | our @SIZE; # size of face, in octets |
|
|
3533 | our @META; # meta hash of face, if any |
|
|
3534 | our $DATAFH; # facedata filehandle |
|
|
3535 | |
3526 | # internal api, not fianlised |
3536 | # internal api, not finalised |
3527 | sub add_face { |
3537 | sub set { |
3528 | my ($name, $type, $data) = @_; |
3538 | my ($name, $type, $data) = @_; |
3529 | |
3539 | |
3530 | my $idx = cf::face::find $name; |
3540 | my $idx = cf::face::find $name; |
3531 | |
3541 | |
3532 | if ($idx) { |
3542 | if ($idx) { |
3533 | delete $FACEHASH{cf::face::get_chksum $idx}; |
3543 | delete $HASH{cf::face::get_chksum $idx}; |
3534 | } else { |
3544 | } else { |
3535 | $idx = cf::face::alloc $name; |
3545 | $idx = cf::face::alloc $name; |
3536 | } |
3546 | } |
3537 | |
3547 | |
3538 | my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; |
3548 | my $hash = cf::face::mangle_csum Digest::MD5::md5 $data; |
3539 | |
3549 | |
3540 | cf::face::set_type $idx, $type; |
3550 | cf::face::set_type $idx, $type; |
3541 | cf::face::set_data $idx, 0, $data, $hash; |
3551 | cf::face::set_csum $idx, 0, $hash; |
3542 | cf::face::set_meta $idx, $type & 1 ? undef : undef; |
3552 | |
|
|
3553 | # we need to destroy the SV itself, not just modify it, as a running ix |
|
|
3554 | # might hold a reference to it: "delete" achieves that. |
|
|
3555 | delete $FOFS[0][$idx]; |
|
|
3556 | delete $DATA[0][$idx]; |
|
|
3557 | $DATA[0][$idx] = $data; |
|
|
3558 | $SIZE[0][$idx] = length $data; |
|
|
3559 | delete $META[$idx]; |
3543 | $FACEHASH{$hash} = $idx;#d# |
3560 | $HASH{$hash} = $idx;#d# |
3544 | |
3561 | |
3545 | $idx |
3562 | $idx |
|
|
3563 | } |
|
|
3564 | |
|
|
3565 | sub _get_data($$$) { |
|
|
3566 | my ($idx, $set, $cb) = @_; |
|
|
3567 | |
|
|
3568 | if (defined $DATA[$set][$idx]) { |
|
|
3569 | $cb->($DATA[$set][$idx]); |
|
|
3570 | } elsif (my $fofs = $FOFS[$set][$idx]) { |
|
|
3571 | my $size = $SIZE[$set][$idx]; |
|
|
3572 | my $buf; |
|
|
3573 | IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub { |
|
|
3574 | if ($_[0] == $size) { |
|
|
3575 | #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d# |
|
|
3576 | $cb->($buf); |
|
|
3577 | } else { |
|
|
3578 | cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request."; |
|
|
3579 | } |
|
|
3580 | }; |
|
|
3581 | } else { |
|
|
3582 | cf::error "requested facedata for unknown face $idx#$set, ignoring."; |
|
|
3583 | } |
|
|
3584 | } |
|
|
3585 | |
|
|
3586 | # rather ineffient |
|
|
3587 | sub cf::face::get_data($;$) { |
|
|
3588 | my ($idx, $set) = @_; |
|
|
3589 | |
|
|
3590 | _get_data $idx, $set, Coro::rouse_cb; |
|
|
3591 | Coro::rouse_wait |
|
|
3592 | } |
|
|
3593 | |
|
|
3594 | sub cf::face::ix { |
|
|
3595 | my ($ns, $set, $idx, $pri) = @_; |
|
|
3596 | |
|
|
3597 | _get_data $idx, $set, sub { |
|
|
3598 | $ns->ix_send ($idx, $pri, $_[0]); |
|
|
3599 | }; |
|
|
3600 | } |
3546 | } |
3601 | } |
3547 | |
3602 | |
3548 | sub load_facedata($) { |
3603 | sub load_facedata($) { |
3549 | my ($path) = @_; |
3604 | my ($path) = @_; |
3550 | |
3605 | |
3551 | # HACK to clear player env face cache, we need some signal framework |
|
|
3552 | # for this (global event?) |
|
|
3553 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3554 | |
|
|
3555 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3606 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3556 | |
3607 | |
3557 | trace "loading facedata from $path\n"; |
3608 | trace "loading facedata from $path\n"; |
3558 | |
3609 | |
3559 | my $facedata = decode_storable load_file $path; |
3610 | my $facedata = decode_storable load_file "$path/faceinfo"; |
3560 | |
3611 | |
3561 | $facedata->{version} == 2 |
3612 | $facedata->{version} == 2 |
3562 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3613 | or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed."; |
3563 | |
3614 | |
3564 | cf::cede_to_tick; |
3615 | my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0 |
|
|
3616 | or cf::cleanup "$path/facedata: $!, cannot proceed."; |
|
|
3617 | |
|
|
3618 | get_slot 1, -100, "load_facedata"; # make sure we get a very big slot |
|
|
3619 | |
|
|
3620 | # BEGIN ATOMIC |
|
|
3621 | # from here on, everything must be atomic - no thread switch allowed |
|
|
3622 | my $t1 = EV::time; |
3565 | |
3623 | |
3566 | { |
3624 | { |
3567 | my $faces = $facedata->{faceinfo}; |
3625 | my $faces = $facedata->{faceinfo}; |
3568 | |
3626 | |
3569 | for my $face (sort keys %$faces) { |
3627 | for my $face (sort keys %$faces) { |
3570 | my $info = $faces->{$face}; |
3628 | my $info = $faces->{$face}; |
3571 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3629 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3572 | |
3630 | |
3573 | cf::face::set_visibility $idx, $info->{visibility}; |
3631 | cf::face::set_visibility $idx, $info->{visibility}; |
3574 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3632 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3575 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3633 | cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64}; |
3576 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3634 | cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32}; |
3577 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3635 | cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph}; |
3578 | $FACEHASH{$info->{hash64}} = $idx;#d# |
3636 | $cf::face::HASH{$info->{hash64}} = $idx; |
3579 | |
3637 | delete $cf::face::META[$idx]; |
3580 | cf::cede_to_tick; |
|
|
3581 | } |
3638 | } |
3582 | |
3639 | |
3583 | while (my ($face, $info) = each %$faces) { |
3640 | while (my ($face, $info) = each %$faces) { |
3584 | next unless $info->{smooth}; |
3641 | next unless $info->{smooth}; |
3585 | |
3642 | |
… | |
… | |
3590 | cf::face::set_smooth $idx, $smooth; |
3647 | cf::face::set_smooth $idx, $smooth; |
3591 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3648 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3592 | } else { |
3649 | } else { |
3593 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3650 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3594 | } |
3651 | } |
3595 | |
|
|
3596 | cf::cede_to_tick; |
|
|
3597 | } |
3652 | } |
3598 | } |
3653 | } |
3599 | |
3654 | |
3600 | { |
3655 | { |
3601 | my $anims = $facedata->{animinfo}; |
3656 | my $anims = $facedata->{animinfo}; |
3602 | |
3657 | |
3603 | while (my ($anim, $info) = each %$anims) { |
3658 | while (my ($anim, $info) = each %$anims) { |
3604 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3659 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3605 | cf::cede_to_tick; |
|
|
3606 | } |
3660 | } |
3607 | |
3661 | |
3608 | cf::anim::invalidate_all; # d'oh |
3662 | cf::anim::invalidate_all; # d'oh |
3609 | } |
3663 | } |
3610 | |
3664 | |
… | |
… | |
3615 | if (defined (my $type = $info->{type})) { |
3669 | if (defined (my $type = $info->{type})) { |
3616 | # TODO: different hash - must free and use new index, or cache ixface data queue |
3670 | # TODO: different hash - must free and use new index, or cache ixface data queue |
3617 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3671 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3618 | |
3672 | |
3619 | cf::face::set_type $idx, $type; |
3673 | cf::face::set_type $idx, $type; |
3620 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3674 | cf::face::set_csum $idx, 0, $info->{hash}; |
|
|
3675 | $cf::face::SIZE[0][$idx] = $info->{size}; |
|
|
3676 | $cf::face::FOFS[0][$idx] = $info->{fofs}; |
3621 | cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3677 | $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already |
3622 | $FACEHASH{$info->{hash}} = $idx;#d# |
3678 | $cf::face::HASH{$info->{hash}} = $idx; |
3623 | } else { |
3679 | } else { |
3624 | # $RESOURCE{$name} = $info; # unused |
3680 | # $RESOURCE{$name} = $info; # unused |
3625 | } |
3681 | } |
3626 | |
|
|
3627 | cf::cede_to_tick; |
|
|
3628 | } |
3682 | } |
3629 | } |
3683 | } |
|
|
3684 | |
|
|
3685 | ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh); |
|
|
3686 | |
|
|
3687 | # HACK to clear player env face cache, we need some signal framework |
|
|
3688 | # for this (global event?) |
|
|
3689 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3690 | |
|
|
3691 | # END ATOMIC |
|
|
3692 | |
|
|
3693 | cf::debug "facedata atomic update time ", EV::time - $t1; |
3630 | |
3694 | |
3631 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
3695 | cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); |
|
|
3696 | |
|
|
3697 | aio_close $fh if $fh; # close old facedata |
3632 | |
3698 | |
3633 | 1 |
3699 | 1 |
3634 | } |
3700 | } |
3635 | |
3701 | |
3636 | register_exticmd fx_want => sub { |
3702 | register_exticmd fx_want => sub { |
… | |
… | |
3652 | } |
3718 | } |
3653 | |
3719 | |
3654 | sub reload_exp_table { |
3720 | sub reload_exp_table { |
3655 | _reload_exp_table; |
3721 | _reload_exp_table; |
3656 | |
3722 | |
|
|
3723 | cf::face::set |
3657 | add_face "res/exp_table" => FT_RSRC, |
3724 | "res/exp_table" => FT_RSRC, |
3658 | JSON::XS->new->utf8->canonical->encode ( |
3725 | JSON::XS->new->utf8->canonical->encode ( |
3659 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3726 | [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] |
3660 | ); |
3727 | ); |
3661 | } |
3728 | } |
3662 | |
3729 | |
3663 | sub reload_materials { |
3730 | sub reload_materials { |
3664 | _reload_materials; |
3731 | _reload_materials; |
3665 | } |
3732 | } |
… | |
… | |
3677 | if exists $_->{match}; |
3744 | if exists $_->{match}; |
3678 | } |
3745 | } |
3679 | } |
3746 | } |
3680 | |
3747 | |
3681 | sub reload_facedata { |
3748 | sub reload_facedata { |
3682 | load_facedata "$DATADIR/facedata" |
3749 | load_facedata $DATADIR |
3683 | or die "unable to load facedata\n"; |
3750 | or die "unable to load facedata\n"; |
3684 | } |
3751 | } |
3685 | |
3752 | |
3686 | sub reload_archetypes { |
3753 | sub reload_archetypes { |
3687 | load_resource_file "$DATADIR/archetypes" |
3754 | load_resource_file "$DATADIR/archetypes" |
3688 | or die "unable to load archetypes\n"; |
3755 | or die "unable to load archetypes\n"; |
3689 | |
3756 | |
|
|
3757 | cf::face::set |
3690 | add_face "res/skill_info" => FT_RSRC, |
3758 | "res/skill_info" => FT_RSRC, |
3691 | JSON::XS->new->utf8->canonical->encode ( |
3759 | JSON::XS->new->utf8->canonical->encode ( |
3692 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3760 | [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] |
3693 | ); |
3761 | ); |
|
|
3762 | |
|
|
3763 | cf::face::set |
3694 | add_face "res/spell_paths" => FT_RSRC, |
3764 | "res/spell_paths" => FT_RSRC, |
3695 | JSON::XS->new->utf8->canonical->encode ( |
3765 | JSON::XS->new->utf8->canonical->encode ( |
3696 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3766 | [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] |
3697 | ); |
3767 | ); |
3698 | } |
3768 | } |
3699 | |
3769 | |
3700 | sub reload_treasures { |
3770 | sub reload_treasures { |
3701 | load_resource_file "$DATADIR/treasures" |
3771 | load_resource_file "$DATADIR/treasures" |
3702 | or die "unable to load treasurelists\n"; |
3772 | or die "unable to load treasurelists\n"; |
… | |
… | |
3718 | |
3788 | |
3719 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
3789 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
3720 | my $face = cf::face::find "sound/$v"; |
3790 | my $face = cf::face::find "sound/$v"; |
3721 | cf::sound::set $k => $face; |
3791 | cf::sound::set $k => $face; |
3722 | } |
3792 | } |
3723 | } |
|
|
3724 | |
|
|
3725 | #d# move docstuff to help or so |
|
|
3726 | our %DOCSTRING; |
|
|
3727 | |
|
|
3728 | sub reload_pod { |
|
|
3729 | trace "loading pods $PODDIR\n"; |
|
|
3730 | |
|
|
3731 | %DOCSTRING = (); |
|
|
3732 | my @command_list; |
|
|
3733 | |
|
|
3734 | for ( |
|
|
3735 | [0, "command_help"], |
|
|
3736 | [1, "emote_help"], |
|
|
3737 | [2, "dmcommand_help"], |
|
|
3738 | ) { |
|
|
3739 | my ($type, $path) = @$_; |
|
|
3740 | |
|
|
3741 | my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod") |
|
|
3742 | or die "unable to load $path"; |
|
|
3743 | |
|
|
3744 | my $level = 1e9; |
|
|
3745 | my $rpar; |
|
|
3746 | |
|
|
3747 | for my $par (@$paragraphs) { |
|
|
3748 | if ($par->{type} eq "head2") { |
|
|
3749 | # this code taken almost verbatim from DC/Protocol.pm |
|
|
3750 | |
|
|
3751 | if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) { |
|
|
3752 | my $cmd = $1; |
|
|
3753 | my @args = split /\|/, $2; |
|
|
3754 | @args = (".*") unless @args; |
|
|
3755 | |
|
|
3756 | $_ = $_ eq ".*" ? "" : " $_" |
|
|
3757 | for @args; |
|
|
3758 | |
|
|
3759 | my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args; |
|
|
3760 | |
|
|
3761 | $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par])); |
|
|
3762 | |
|
|
3763 | push @command_list, [$type, \@variants]; |
|
|
3764 | $level = $par->{level}; |
|
|
3765 | } else { |
|
|
3766 | error "$par->{markup}: unparsable command heading"; |
|
|
3767 | } |
|
|
3768 | } elsif ($par->{level} > $level) { |
|
|
3769 | $$rpar .= &cf::pod::as_cfpod ([$par]); |
|
|
3770 | } |
|
|
3771 | |
|
|
3772 | cf::cede_to_tick; |
|
|
3773 | } |
|
|
3774 | } |
|
|
3775 | |
|
|
3776 | @command_list = sort { |
|
|
3777 | $a->[0] <=> $b->[0] |
|
|
3778 | or $a->[1] cmp $b->[1] |
|
|
3779 | } @command_list; |
|
|
3780 | |
|
|
3781 | cf::cede_to_tick; |
|
|
3782 | |
|
|
3783 | add_face "res/command_list" => FT_RSRC, |
|
|
3784 | JSON::XS->new->utf8->encode (\@command_list); |
|
|
3785 | } |
3793 | } |
3786 | |
3794 | |
3787 | sub reload_resources { |
3795 | sub reload_resources { |
3788 | trace "reloading resource files...\n"; |
3796 | trace "reloading resource files...\n"; |
3789 | |
3797 | |
… | |
… | |
3792 | reload_exp_table; |
3800 | reload_exp_table; |
3793 | reload_sound; |
3801 | reload_sound; |
3794 | reload_archetypes; |
3802 | reload_archetypes; |
3795 | reload_regions; |
3803 | reload_regions; |
3796 | reload_treasures; |
3804 | reload_treasures; |
3797 | reload_pod; |
|
|
3798 | |
3805 | |
3799 | trace "finished reloading resource files\n"; |
3806 | trace "finished reloading resource files\n"; |
3800 | } |
3807 | } |
3801 | |
3808 | |
3802 | sub reload_config { |
3809 | sub reload_config { |