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.611 by root, Tue Nov 20 14:54:17 2012 UTC vs.
Revision 1.614 by root, Mon Nov 26 15:12:16 2012 UTC

… …
597 my $busy; 597 my $busy;
598 598
599 while () { 599 while () {
600 next_job: 600 next_job:
601 601
602 Coro::cede;
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 }
… …
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
… …
3286 3311
3287sub cf::client::update_command_faces { 3312sub cf::client::update_command_faces {
3288 my ($self) = @_; 3313 my ($self) = @_;
3289 3314
3290 my @faces = grep $_, 3315 my @faces = grep $_,
3316 $COMMAND_FACE{preferred},
3291 $COMMAND_FACE{standard}, 3317 $COMMAND_FACE{standard},
3292 $COMMAND_FACE{emote},
3293 $COMMAND_FACE{skill}, 3318 $COMMAND_FACE{skill},
3294 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (), 3319 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3320 $COMMAND_FACE{emote},
3295 ; 3321 ;
3296 3322
3297 $self->send_face ($_) 3323 $self->send_face ($_)
3298 for @faces; 3324 for @faces;
3299 $self->flush_fx; 3325 $self->flush_fx;

Diff Legend

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