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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.521 by root, Fri Apr 16 23:28:42 2010 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

 our $EMERGENCY_POSITION;
 sub cf::map::normalise;
+sub in_main() {
+   $Coro::current == $Coro::main
+}
 #############################################################################
 %REFLECT = ();
 for (@REFLECT) {
    my $reflect = JSON::XS::decode_json $_;
 $Coro::State::DIEHOOK = sub {
    return unless $^S eq 0; # "eq", not "=="
    warn Carp::longmess $_[0];
-   if ($Coro::current == $Coro::main) {#d#
+   if (in_main) {#d#
       warn "DIEHOOK called in main context, Coro bug?\n";#d#
       return;#d#
    }#d#
    # kill coroutine otherwise
    \@logins
 }
 =item $player->maps
+=item cf::player::maps $login
 Returns an arrayref of map paths that are private for this
 player. May block.
 =cut
 =cut
 sub find_by_path($) {
    my ($path) = @_;
+   $path =~ s/^~[^\/]*//; # skip ~login
    my ($match, $specificity);
    for my $region (list) {
       if ($region->{match} && $path =~ $region->{match}) {
    }
 }
 sub do_reload_perl() {
    # can/must only be called in main
-   if ($Coro::current != $Coro::main) {
+   if (in_main) {
       warn "can only reload from main coroutine";
       return;
    }
    return if $RELOAD++;

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