[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

 use Coro::AIO;
 =head3 cf::player
 =over 4
+=item cf::player::num_playing
+Returns the official number of playing players, as per the Crossfire metaserver rules.
+=cut
+sub num_playing {
+   scalar grep
+      $_->ob->map
+      && !$_->hidden
+      && !$_->ob->flag (cf::FLAG_WIZ),
+      cf::player::list
+}
 =item cf::player::find $login
 Returns the given player object, loading it if necessary (might block).
    {
       my $guard = cf::lock_acquire "map_data:$path";
       return unless $self->valid;
-      return if $self->in_memory != cf::MAP_SWAPPED;
+      return unless $self->in_memory == cf::MAP_SWAPPED;
       $self->in_memory (cf::MAP_LOADING);
       $self->alloc;
    return if $self->players;
    return if $self->in_memory != cf::MAP_IN_MEMORY;
    return if $self->{deny_save};
+   $self->in_memory (cf::MAP_SWAPPED);
    $self->deactivate;
+   $_->clear_links_to ($self) for values %cf::MAP;
    $self->clear;
-   $self->in_memory (cf::MAP_SWAPPED);
 }
 sub reset_at {
    my ($self) = @_;
    }
    delete $cf::MAP{$self->path};
    $self->deactivate;
+   $_->clear_links_to ($self) for values %cf::MAP;
    $self->clear;
-   $_->clear_links_to ($self) for values %cf::MAP;
    $self->unlink_save;
    $self->destroy;
 }

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