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.612 by root, Wed Nov 21 12:47:09 2012 UTC vs.
Revision 1.617 by root, Mon Aug 10 18:46:04 2015 UTC

… …
687 687
688 while ($busy) { 688 while ($busy) {
689 if (Coro::nready) { 689 if (Coro::nready) {
690 Coro::cede_notself; 690 Coro::cede_notself;
691 } else { 691 } else {
692 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
693 } 693 }
694 } 694 }
695 695
696 my $time = AE::time - $time; 696 my $time = AE::time - $time;
697 697
… …
2742=item $player_object->may ("access") 2742=item $player_object->may ("access")
2743 2743
2744Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2745(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2746 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
2747=cut 2772=cut
2748 2773
2749sub cf::object::player::may { 2774sub cf::object::player::may {
2750 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2751 2776
2752 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2753 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2754 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2755 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2756} 2781}
2757 2782
2758=item $player_object->enter_link 2783=item $player_object->enter_link
2759 2784
… …
2762The 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.
2763for 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,
2764though, 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
2765map. 2790map.
2766 2791
2767Will 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.
2768 2799
2769=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2770 2801
2771Moves 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
2772map. 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
… …
3286 3317
3287sub cf::client::update_command_faces { 3318sub cf::client::update_command_faces {
3288 my ($self) = @_; 3319 my ($self) = @_;
3289 3320
3290 my @faces = grep $_, 3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3291 $COMMAND_FACE{standard}, 3323 $COMMAND_FACE{standard},
3292 $COMMAND_FACE{emote},
3293 $COMMAND_FACE{skill}, 3324 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (), 3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3295 ; 3327 ;
3296 3328
3297 $self->send_face ($_) 3329 $self->send_face ($_)
3298 for @faces; 3330 for @faces;
3299 $self->flush_fx; 3331 $self->flush_fx;
… …
3883 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3884 print $fh $$; 3916 print $fh $$;
3885} 3917}
3886 3918
3887sub main_loop { 3919sub main_loop {
3888 trace "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3889 if (1) { 3921 if (1) {
3890 EV::loop; 3922 EV::run;
3891 } 3923 }
3892 trace "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3893 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3894} 3926}
3895 3927
3896sub main { 3928sub main {
3897 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
… …
3906 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3907 $Coro::idle = sub { 3939 $Coro::idle = sub {
3908 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#
3909 (async { 3941 (async {
3910 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3911 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONESHOT;
3912 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3913 }; 3945 };
3914 3946
3915 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3916 3948

Diff Legend

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