ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.594 by root, Fri Nov 9 02:50:50 2012 UTC vs.
Revision 1.613 by root, Mon Nov 26 13:12:16 2012 UTC

… …
58use BDB (); 58use BDB ();
59use Data::Dumper; 59use Data::Dumper;
60use Fcntl; 60use Fcntl;
61use YAML::XS (); 61use YAML::XS ();
62use IO::AIO (); 62use IO::AIO ();
63use Time::HiRes;
64use Compress::LZF; 63use Compress::LZF;
65use Digest::MD5 (); 64use Digest::MD5 ();
66 65
67AnyEvent::detect; 66AnyEvent::detect;
68 67
… …
252Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
253from wherever your confdir points to. 252from 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
257These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
258returns directly I<after> the tick processing (and consequently, can only wake one thread 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
259per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260 260
261Note that cf::Wait_for_tick will immediately return when the server is not 261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run 262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really> 263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
265 265
266=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
573Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $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
575C<$time> seconds of cpu time till the next tick. The slot is only valid 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede. 576till the next cede.
577 577
578Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more. 579should use 100 or more.
580 580
581The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
582used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
583 583
… …
596 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy; 597 my $busy;
598 598
599 while () { 599 while () {
600 next_job: 600 next_job:
601
602 Coro::cede;
601 603
602 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
603 605
604 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
605 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0; 608 $busy = 0;
607 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
608 $job->[2]->send; 610 $job->[2]->send;
609 Coro::cede;
610 goto next_job; 611 goto next_job;
611 } else { 612 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
613 } 614 }
614 } 615 }
615 616
616 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
617 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
618 $WAIT_FOR_TICK->wait;
619 } else { 619 } else {
620 $busy = 0; 620 $busy = 0;
621 Coro::schedule; 621 Coro::schedule;
622 } 622 }
623 } 623 }
… …
738 reset_signals; 738 reset_signals;
739} 739}
740 740
741sub fork_call(&@) { 741sub 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
2655Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates 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
2659returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2660even if the object actually exists. May block. 2656even if the object actually exists. May block.
2661 2657
2662=cut 2658=cut
2663 2659
2664sub deref { 2660sub deref {
… …
3046 3042
3047=head3 cf::client 3043=head3 cf::client
3048 3044
3049=over 4 3045=over 4
3050 3046
3051=item $client->send_drawinfo ($text, $flags)
3052
3053Sends a drawinfo packet to the client. Circumvents output buffering so
3054should not be used under normal circumstances.
3055
3056=cut
3057
3058sub cf::client::send_drawinfo {
3059 my ($self, $text, $flags) = @_;
3060
3061 utf8::encode $text;
3062 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3063}
3064
3065=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
3066 3048
3067Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
3068them as required. 3050them as required.
3069 3051
… …
3087 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
3088} 3070}
3089 3071
3090=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
3091 3073
3092Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
3093client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
3094the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
3095the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
3096 3078
3097=cut 3079=cut
3098 3080
3099# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
… …
3204 id => "death", 3186 id => "death",
3205 title => "Death", 3187 title => "Death",
3206 reply => undef, 3188 reply => undef,
3207 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3208 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3209 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3210 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3211); 3199);
3212 3200
3213sub cf::client::send_msg { 3201sub cf::client::send_msg {
… …
3286 3274
3287 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
3288 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
3289 3277
3290 1 3278 1
3279}
3280
3281=item $client->update_command_faces
3282
3283=cut
3284
3285our %COMMAND_FACE;
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = grep $_,
3291 $COMMAND_FACE{preferred},
3292 $COMMAND_FACE{standard},
3293 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3295 $COMMAND_FACE{emote},
3296 ;
3297
3298 $self->send_face ($_)
3299 for @faces;
3300 $self->flush_fx;
3301
3302 $self->ext_msg (command_list => @faces);
3303}
3304
3305=item cf::client::set_command_face $type, $commands
3306
3307=cut
3308
3309sub cf::client::set_command_face {
3310 my ($type, $list) = @_;
3311
3312 my $idx = &cf::face::set ( #d# ugly forward reference
3313 "command_list/$type" => cf::FT_RSRC,
3314 JSON::XS->new->utf8->encode ([ sort @$list ])
3315 );
3316
3317 $COMMAND_FACE{$type} = $idx;
3291} 3318}
3292 3319
3293cf::client->attach ( 3320cf::client->attach (
3294 on_connect => sub { 3321 on_connect => sub {
3295 my ($ns) = @_; 3322 my ($ns) = @_;
… …
3519=cut 3546=cut
3520 3547
3521############################################################################# 3548#############################################################################
3522# the server's init and main functions 3549# the server's init and main functions
3523 3550
3524our %FACEHASH; # hash => idx, #d# HACK for http server 3551{
3552 package cf::face;
3525 3553
3554 our %HASH; # hash => idx
3555 our @DATA; # dynamically-created facedata, only faceste 0 used
3556 our @FOFS; # file offset, if > 0
3557 our @SIZE; # size of face, in octets
3558 our @META; # meta hash of face, if any
3559 our $DATAFH; # facedata filehandle
3560
3526# internal api, not fianlised 3561 # internal api, not finalised
3527sub add_face { 3562 sub set {
3528 my ($name, $type, $data) = @_; 3563 my ($name, $type, $data) = @_;
3529 3564
3530 my $idx = cf::face::find $name; 3565 my $idx = cf::face::find $name;
3531 3566
3532 if ($idx) { 3567 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx}; 3568 delete $HASH{cf::face::get_csum $idx};
3534 } else { 3569 } else {
3535 $idx = cf::face::alloc $name; 3570 $idx = cf::face::alloc $name;
3536 } 3571 }
3537 3572
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3573 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3539 3574
3540 cf::face::set_type $idx, $type; 3575 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash; 3576 cf::face::set_csum $idx, 0, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3577
3578 # we need to destroy the SV itself, not just modify it, as a running ix
3579 # might hold a reference to it: "delete" achieves that.
3580 delete $FOFS[0][$idx];
3581 delete $DATA[0][$idx];
3582 $DATA[0][$idx] = $data;
3583 $SIZE[0][$idx] = length $data;
3584 delete $META[$idx];
3543 $FACEHASH{$hash} = $idx;#d# 3585 $HASH{$hash} = $idx;#d#
3544 3586
3545 $idx 3587 $idx
3588 }
3589
3590 sub _get_data($$$) {
3591 my ($idx, $set, $cb) = @_;
3592
3593 if (defined $DATA[$set][$idx]) {
3594 $cb->($DATA[$set][$idx]);
3595 } elsif (my $fofs = $FOFS[$set][$idx]) {
3596 my $size = $SIZE[$set][$idx];
3597 my $buf;
3598 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3599 if ($_[0] == $size) {
3600 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3601 $cb->($buf);
3602 } else {
3603 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3604 }
3605 };
3606 } else {
3607 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3608 }
3609 }
3610
3611 # rather ineffient
3612 sub cf::face::get_data($;$) {
3613 my ($idx, $set) = @_;
3614
3615 _get_data $idx, $set, Coro::rouse_cb;
3616 Coro::rouse_wait
3617 }
3618
3619 sub cf::face::ix {
3620 my ($ns, $set, $idx, $pri) = @_;
3621
3622 _get_data $idx, $set, sub {
3623 $ns->ix_send ($idx, $pri, $_[0]);
3624 };
3625 }
3546} 3626}
3547 3627
3548sub load_facedata($) { 3628sub load_facedata($) {
3549 my ($path) = @_; 3629 my ($path) = @_;
3550 3630
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; 3631 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3556 3632
3557 trace "loading facedata from $path\n"; 3633 trace "loading facedata from $path\n";
3558 3634
3559 my $facedata = decode_storable load_file $path; 3635 my $facedata = decode_storable load_file "$path/faceinfo";
3560 3636
3561 $facedata->{version} == 2 3637 $facedata->{version} == 2
3562 or cf::cleanup "$path: version mismatch, cannot proceed."; 3638 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3563 3639
3564 cf::cede_to_tick; 3640 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3641 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3642
3643 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3644
3645 # BEGIN ATOMIC
3646 # from here on, everything must be atomic - no thread switch allowed
3647 my $t1 = EV::time;
3565 3648
3566 { 3649 {
3567 my $faces = $facedata->{faceinfo}; 3650 my $faces = $facedata->{faceinfo};
3568 3651
3569 for my $face (sort keys %$faces) { 3652 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face}; 3653 my $info = $faces->{$face};
3571 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3654 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3572 3655
3573 cf::face::set_visibility $idx, $info->{visibility}; 3656 cf::face::set_visibility $idx, $info->{visibility};
3574 cf::face::set_magicmap $idx, $info->{magicmap}; 3657 cf::face::set_magicmap $idx, $info->{magicmap};
3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3658 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}; 3659 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} ; 3660 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3578 $FACEHASH{$info->{hash64}} = $idx;#d# 3661 $cf::face::HASH{$info->{hash64}} = $idx;
3579 3662 delete $cf::face::META[$idx];
3580 cf::cede_to_tick;
3581 } 3663 }
3582 3664
3583 while (my ($face, $info) = each %$faces) { 3665 while (my ($face, $info) = each %$faces) {
3584 next unless $info->{smooth}; 3666 next unless $info->{smooth};
3585 3667
… …
3590 cf::face::set_smooth $idx, $smooth; 3672 cf::face::set_smooth $idx, $smooth;
3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3673 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3592 } else { 3674 } else {
3593 error "smooth face '$info->{smooth}' not found for face '$face'"; 3675 error "smooth face '$info->{smooth}' not found for face '$face'";
3594 } 3676 }
3595
3596 cf::cede_to_tick;
3597 } 3677 }
3598 } 3678 }
3599 3679
3600 { 3680 {
3601 my $anims = $facedata->{animinfo}; 3681 my $anims = $facedata->{animinfo};
3602 3682
3603 while (my ($anim, $info) = each %$anims) { 3683 while (my ($anim, $info) = each %$anims) {
3604 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3684 cf::anim::set $anim, $info->{frames}, $info->{facings};
3605 cf::cede_to_tick;
3606 } 3685 }
3607 3686
3608 cf::anim::invalidate_all; # d'oh 3687 cf::anim::invalidate_all; # d'oh
3609 } 3688 }
3610 3689
… …
3615 if (defined (my $type = $info->{type})) { 3694 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue 3695 # 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; 3696 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3618 3697
3619 cf::face::set_type $idx, $type; 3698 cf::face::set_type $idx, $type;
3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3699 cf::face::set_csum $idx, 0, $info->{hash};
3700 $cf::face::SIZE[0][$idx] = $info->{size};
3701 $cf::face::FOFS[0][$idx] = $info->{fofs};
3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3702 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d# 3703 $cf::face::HASH{$info->{hash}} = $idx;
3623 } else { 3704 } else {
3624# $RESOURCE{$name} = $info; # unused 3705# $RESOURCE{$name} = $info; # unused
3625 } 3706 }
3626
3627 cf::cede_to_tick;
3628 } 3707 }
3629 } 3708 }
3709
3710 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3711
3712 # HACK to clear player env face cache, we need some signal framework
3713 # for this (global event?)
3714 %ext::player_env::MUSIC_FACE_CACHE = ();
3715
3716 # END ATOMIC
3717
3718 cf::debug "facedata atomic update time ", EV::time - $t1;
3630 3719
3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3720 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3721
3722 aio_close $fh if $fh; # close old facedata
3632 3723
3633 1 3724 1
3634} 3725}
3635 3726
3636register_exticmd fx_want => sub { 3727register_exticmd fx_want => sub {
… …
3652} 3743}
3653 3744
3654sub reload_exp_table { 3745sub reload_exp_table {
3655 _reload_exp_table; 3746 _reload_exp_table;
3656 3747
3748 cf::face::set
3657 add_face "res/exp_table" => FT_RSRC, 3749 "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode ( 3750 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3751 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 ); 3752 );
3661} 3753}
3662 3754
3663sub reload_materials { 3755sub reload_materials {
3664 _reload_materials; 3756 _reload_materials;
3665} 3757}
… …
3677 if exists $_->{match}; 3769 if exists $_->{match};
3678 } 3770 }
3679} 3771}
3680 3772
3681sub reload_facedata { 3773sub reload_facedata {
3682 load_facedata "$DATADIR/facedata" 3774 load_facedata $DATADIR
3683 or die "unable to load facedata\n"; 3775 or die "unable to load facedata\n";
3684} 3776}
3685 3777
3686sub reload_archetypes { 3778sub reload_archetypes {
3687 load_resource_file "$DATADIR/archetypes" 3779 load_resource_file "$DATADIR/archetypes"
3688 or die "unable to load archetypes\n"; 3780 or die "unable to load archetypes\n";
3689 3781
3782 cf::face::set
3690 add_face "res/skill_info" => FT_RSRC, 3783 "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode ( 3784 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3785 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 ); 3786 );
3787
3788 cf::face::set
3694 add_face "res/spell_paths" => FT_RSRC, 3789 "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode ( 3790 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3791 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 ); 3792 );
3793
3794 # command completion
3795 my @commands;
3796
3797 for (0..cf::arch::skillvec_size - 1) {
3798 my $skill = cf::arch::skillvec $_;
3799 my $name = $skill->name;
3800 my $flags = cf::skill_flags $skill->subtype;
3801
3802 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3803 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3804 }
3805
3806 cf::client::set_command_face skill => \@commands;
3698} 3807}
3699 3808
3700sub reload_treasures { 3809sub reload_treasures {
3701 load_resource_file "$DATADIR/treasures" 3810 load_resource_file "$DATADIR/treasures"
3702 or die "unable to load treasurelists\n"; 3811 or die "unable to load treasurelists\n";
… …
3718 3827
3719 while (my ($k, $v) = each %{$soundconf->{event}}) { 3828 while (my ($k, $v) = each %{$soundconf->{event}}) {
3720 my $face = cf::face::find "sound/$v"; 3829 my $face = cf::face::find "sound/$v";
3721 cf::sound::set $k => $face; 3830 cf::sound::set $k => $face;
3722 } 3831 }
3723}
3724
3725#d# move docstuff to help or so
3726our %DOCSTRING;
3727
3728sub 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} 3832}
3786 3833
3787sub reload_resources { 3834sub reload_resources {
3788 trace "reloading resource files...\n"; 3835 trace "reloading resource files...\n";
3789 3836
… …
3792 reload_exp_table; 3839 reload_exp_table;
3793 reload_sound; 3840 reload_sound;
3794 reload_archetypes; 3841 reload_archetypes;
3795 reload_regions; 3842 reload_regions;
3796 reload_treasures; 3843 reload_treasures;
3797 reload_pod;
3798 3844
3799 trace "finished reloading resource files\n"; 3845 trace "finished reloading resource files\n";
3800} 3846}
3801 3847
3802sub reload_config { 3848sub reload_config {

Diff Legend

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