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.598 by root, Sun Nov 11 02:38:10 2012 UTC vs.
Revision 1.616 by root, Mon Aug 10 03:05:30 2015 UTC

… …
251Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
252from wherever your confdir points to. 252from wherever your confdir points to.
253 253
254=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
255 255
256These 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.
257returns 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
258per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
259 260
260Note 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
261ticking, 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
262when 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>
263want to wait, use C<$cf::WAIT_FOR_TICK>). 264want to wait, use C<$cf::WAIT_FOR_TICK>).
264 265
265=item $cf::WAIT_FOR_TICK 266=item $cf::WAIT_FOR_TICK
… …
572Allocate $time seconds of blocking CPU time at priority C<$priority> 573Allocate $time seconds of blocking CPU time at priority C<$priority>
573(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
574C<$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
575till the next cede. 576till the next cede.
576 577
577Background jobs should use a priority les than zero, interactive jobs 578Background jobs should use a priority less than zero, interactive jobs
578should use 100 or more. 579should use 100 or more.
579 580
580The 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
581used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
582 583
… …
595 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
596 my $busy; 597 my $busy;
597 598
598 while () { 599 while () {
599 next_job: 600 next_job:
601
602 Coro::cede;
600 603
601 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
602 605
603 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
604 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
605 $busy = 0; 608 $busy = 0;
606 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
607 $job->[2]->send; 610 $job->[2]->send;
608 Coro::cede;
609 goto next_job; 611 goto next_job;
610 } else { 612 } else {
611 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
612 } 614 }
613 } 615 }
614 616
615 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
616 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
617 $WAIT_FOR_TICK->wait;
618 } else { 619 } else {
619 $busy = 0; 620 $busy = 0;
620 Coro::schedule; 621 Coro::schedule;
621 } 622 }
622 } 623 }
… …
686 687
687 while ($busy) { 688 while ($busy) {
688 if (Coro::nready) { 689 if (Coro::nready) {
689 Coro::cede_notself; 690 Coro::cede_notself;
690 } else { 691 } else {
691 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONESHOT;
692 } 693 }
693 } 694 }
694 695
695 my $time = AE::time - $time; 696 my $time = AE::time - $time;
696 697
… …
737 reset_signals; 738 reset_signals;
738} 739}
739 740
740sub fork_call(&@) { 741sub fork_call(&@) {
741 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
742
743 # we seemingly have to make a local copy of the whole thing,
744 # otherwise perl prematurely frees the stuff :/
745 # TODO: investigate and fix (likely this will be rather laborious)
746 743
747 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
748 cf::post_fork; 745 cf::post_fork;
749 &$cb 746 &$cb
750 } @args; 747 } @args;
… …
2653 2650
2654Creates 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.
2655 2652
2656=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2657 2654
2658returns 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,
2659even if the object actually exists. May block. 2656even if the object actually exists. May block.
2660 2657
2661=cut 2658=cut
2662 2659
2663sub deref { 2660sub deref {
… …
2745=item $player_object->may ("access") 2742=item $player_object->may ("access")
2746 2743
2747Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2748(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2749 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2750=cut 2772=cut
2751 2773
2752sub cf::object::player::may { 2774sub cf::object::player::may {
2753 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2754 2776
2755 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2756 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2757 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2758 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2759} 2781}
2760 2782
2761=item $player_object->enter_link 2783=item $player_object->enter_link
2762 2784
… …
2765The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2766for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2767though, as the player cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2768map. 2790map.
2769 2791
2770Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2771 2799
2772=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2773 2801
2774Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2775map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
… …
3045 3073
3046=head3 cf::client 3074=head3 cf::client
3047 3075
3048=over 4 3076=over 4
3049 3077
3050=item $client->send_drawinfo ($text, $flags)
3051
3052Sends a drawinfo packet to the client. Circumvents output buffering so
3053should not be used under normal circumstances.
3054
3055=cut
3056
3057sub cf::client::send_drawinfo {
3058 my ($self, $text, $flags) = @_;
3059
3060 utf8::encode $text;
3061 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3062}
3063
3064=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
3065 3079
3066Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
3067them as required. 3081them as required.
3068 3082
… …
3086 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
3087} 3101}
3088 3102
3089=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
3090 3104
3091Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
3092client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
3093the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
3094the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
3095 3109
3096=cut 3110=cut
3097 3111
3098# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
… …
3203 id => "death", 3217 id => "death",
3204 title => "Death", 3218 title => "Death",
3205 reply => undef, 3219 reply => undef,
3206 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3207 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3208 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3209 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3210); 3230);
3211 3231
3212sub cf::client::send_msg { 3232sub cf::client::send_msg {
… …
3285 3305
3286 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3287 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3288 3308
3289 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
3290} 3349}
3291 3350
3292cf::client->attach ( 3351cf::client->attach (
3293 on_connect => sub { 3352 on_connect => sub {
3294 my ($ns) = @_; 3353 my ($ns) = @_;
… …
3518=cut 3577=cut
3519 3578
3520############################################################################# 3579#############################################################################
3521# the server's init and main functions 3580# the server's init and main functions
3522 3581
3523our %FACEHASH; # hash => idx, #d# HACK for http server 3582{
3583 package cf::face;
3524 3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3525# internal api, not fianlised 3592 # internal api, not finalised
3526sub set_face { 3593 sub set {
3527 my ($name, $type, $data) = @_; 3594 my ($name, $type, $data) = @_;
3528 3595
3529 my $idx = cf::face::find $name; 3596 my $idx = cf::face::find $name;
3530 3597
3531 if ($idx) { 3598 if ($idx) {
3532 delete $FACEHASH{cf::face::get_chksum $idx}; 3599 delete $HASH{cf::face::get_csum $idx};
3533 } else { 3600 } else {
3534 $idx = cf::face::alloc $name; 3601 $idx = cf::face::alloc $name;
3535 } 3602 }
3536 3603
3537 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data; 3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3538 3605
3539 cf::face::set_type $idx, $type; 3606 cf::face::set_type $idx, $type;
3540 cf::face::set_data $idx, 0, $data, $hash; 3607 cf::face::set_csum $idx, 0, $hash;
3541 cf::face::set_meta $idx, $type & 1 ? undef : undef; 3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3542 $FACEHASH{$hash} = $idx;#d# 3616 $HASH{$hash} = $idx;#d#
3543 3617
3544 $idx 3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3545} 3657}
3546 3658
3547sub load_facedata($) { 3659sub load_facedata($) {
3548 my ($path) = @_; 3660 my ($path) = @_;
3549 3661
3550 # HACK to clear player env face cache, we need some signal framework
3551 # for this (global event?)
3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3553
3554 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3555 3663
3556 trace "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3557 3665
3558 my $facedata = decode_storable load_file $path; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3559 3667
3560 $facedata->{version} == 2 3668 $facedata->{version} == 2
3561 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3562 3670
3563 cf::cede_to_tick; 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3673
3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3675
3676 # BEGIN ATOMIC
3677 # from here on, everything must be atomic - no thread switch allowed
3678 my $t1 = EV::time;
3564 3679
3565 { 3680 {
3566 my $faces = delete $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3567 3682
3568 for my $face (sort keys %$faces) { 3683 for my $face (sort keys %$faces) {
3569 my $info = $faces->{$face}; 3684 my $info = $faces->{$face};
3570 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3571 3686
3572 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3573 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3574 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3575 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3576 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3577 $FACEHASH{$info->{hash64}} = $idx;#d# 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3578 3693 delete $cf::face::META[$idx];
3579 cf::cede_to_tick;
3580 } 3694 }
3581 3695
3582 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3583 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3584 3698
… …
3589 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3590 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3591 } else { 3705 } else {
3592 error "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3593 } 3707 }
3594
3595 cf::cede_to_tick;
3596 } 3708 }
3597 } 3709 }
3598 3710
3599 { 3711 {
3600 my $anims = delete $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3601 3713
3602 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3603 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3604 cf::cede_to_tick;
3605 } 3716 }
3606 3717
3607 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3608 } 3719 }
3609 3720
3610 { 3721 {
3611 my $res = delete $facedata->{resource}; 3722 my $res = $facedata->{resource};
3612 3723
3613 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3614 if (defined (my $type = $info->{type})) { 3725 if (defined (my $type = $info->{type})) {
3615 # TODO: different hash - must free and use new index, or cache ixface data queue 3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3616 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3617 3728
3618 cf::face::set_type $idx, $type; 3729 cf::face::set_type $idx, $type;
3619 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3620 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already 3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3621 $FACEHASH{$info->{hash}} = $idx;#d# 3734 $cf::face::HASH{$info->{hash}} = $idx;
3622 } else { 3735 } else {
3623# $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3624 } 3737 }
3625
3626 cf::cede_to_tick;
3627 } 3738 }
3628 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3629 3750
3630 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3631 3754
3632 1 3755 1
3633} 3756}
3634 3757
3635register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
… …
3651} 3774}
3652 3775
3653sub reload_exp_table { 3776sub reload_exp_table {
3654 _reload_exp_table; 3777 _reload_exp_table;
3655 3778
3779 cf::face::set
3656 set_face "res/exp_table" => FT_RSRC, 3780 "res/exp_table" => FT_RSRC,
3657 JSON::XS->new->utf8->canonical->encode ( 3781 JSON::XS->new->utf8->canonical->encode (
3658 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level] 3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3659 ); 3783 );
3660} 3784}
3661 3785
3662sub reload_materials { 3786sub reload_materials {
3663 _reload_materials; 3787 _reload_materials;
3664} 3788}
… …
3676 if exists $_->{match}; 3800 if exists $_->{match};
3677 } 3801 }
3678} 3802}
3679 3803
3680sub reload_facedata { 3804sub reload_facedata {
3681 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3682 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3683} 3807}
3684 3808
3685sub reload_archetypes { 3809sub reload_archetypes {
3686 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3687 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3688 3812
3813 cf::face::set
3689 set_face "res/skill_info" => FT_RSRC, 3814 "res/skill_info" => FT_RSRC,
3690 JSON::XS->new->utf8->canonical->encode ( 3815 JSON::XS->new->utf8->canonical->encode (
3691 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1] 3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3692 ); 3817 );
3818
3819 cf::face::set
3693 set_face "res/spell_paths" => FT_RSRC, 3820 "res/spell_paths" => FT_RSRC,
3694 JSON::XS->new->utf8->canonical->encode ( 3821 JSON::XS->new->utf8->canonical->encode (
3695 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1] 3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3696 ); 3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3697} 3838}
3698 3839
3699sub reload_treasures { 3840sub reload_treasures {
3700 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3701 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
… …
3774 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3775 print $fh $$; 3916 print $fh $$;
3776} 3917}
3777 3918
3778sub main_loop { 3919sub main_loop {
3779 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3780 if (1) { 3921 if (1) {
3781 EV::loop; 3922 EV::run;
3782 } 3923 }
3783 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3784 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3785} 3926}
3786 3927
3787sub main { 3928sub main {
3788 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
… …
3797 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3798 $Coro::idle = sub { 3939 $Coro::idle = sub {
3799 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3800 (async { 3941 (async {
3801 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3802 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONESHOT;
3803 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3804 }; 3945 };
3805 3946
3806 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3807 3948

Diff Legend

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