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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.488 by root, Wed Oct 21 00:44:39 2009 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 2009 UTC

 use EV;
 use Opcode;
 use Safe;
 use Safe::Hole;
 use Storable ();
+use Carp ();
 use Guard ();
 use Coro ();
 use Coro::State;
 use Coro::Handle;
 )) {
    @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
 }
 $EV::DIED = sub {
-   warn "error in event callback: @_";
+   Carp::cluck "error in event callback: @_";
 };
 #############################################################################
 =head2 UTILITY FUNCTIONS
             : normalise $_
       } @{ aio_readdir $UNIQUEDIR or [] }
    ]
 }
+=item cf::map::static_maps
+Returns an arrayref if paths of all static maps (all preinstalled F<.map>
+file in the shared directory excluding F</styles> and F</editor>). May
+block.
+=cut
+sub static_maps() {
+   my @dirs = "";
+   my @maps;
+   while (@dirs) {
+      my $dir = shift @dirs;
+      next if $dir eq "/styles" || $dir eq "/editor";
+      my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
+         or return;
+      for (@$files) {
+         s/\.map$// or next;
+         utf8::decode $_;
+         push @maps, "$dir/$_";
+      }
+      push @dirs, map "$dir/$_", @$dirs;
+   }
+   \@maps
+}
 =back
 =head3 cf::object
 =cut
    ($x, $y) = (-1, -1)
       unless (defined $x) && (defined $y);
    # use -1 or undef as default coordinates, not 0, 0
    ($x, $y) = ($map->enter_x, $map->enter_y)
-      if $x <=0 && $y <= 0;
+      if $x <= 0 && $y <= 0;
    $map->load;
    $map->load_neighbours;
    return unless $self->contr->active;

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