--- deliantra/server/lib/cf.pm	2010/04/15 06:07:51	1.517
+++ deliantra/server/lib/cf.pm	2010/04/18 07:08:07	1.524
@@ -167,6 +167,10 @@
 
 sub cf::map::normalise;
 
+sub in_main() {
+   $Coro::current == $Coro::main
+}
+
 #############################################################################
 
 %REFLECT = ();
@@ -263,7 +267,7 @@
 
    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#
@@ -1438,6 +1442,9 @@
 
                cf::cleanup "mandatory extension '$k' failed to load, exiting."
                   if exists $v->{meta}{mandatory};
+
+               warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
+               delete $todo{$k};
             } else {
                $done{$k} = delete $todo{$k};
                push @EXTS, $v->{pkg};
@@ -1690,6 +1697,8 @@
 
 =item $player->maps
 
+=item cf::player::maps $login
+
 Returns an arrayref of map paths that are private for this
 player. May block.
 
@@ -1761,6 +1770,8 @@
 sub find_by_path($) {
    my ($path) = @_;
 
+   $path =~ s/^~[^\/]*//; # skip ~login
+
    my ($match, $specificity);
 
    for my $region (list) {
@@ -1833,7 +1844,7 @@
 }
 
 # also paths starting with '/'
-$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
+$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
 
 sub thawer_merge {
    my ($self, $merge) = @_;
@@ -2214,11 +2225,10 @@
    ()
 }
 
-sub save {
+# common code, used by both ->save and ->swapout
+sub _save {
    my ($self) = @_;
 
-   my $lock = cf::lock_acquire "map_data:$self->{path}";
-
    $self->{last_save} = $cf::RUNTIME;
 
    return unless $self->dirty;
@@ -2247,22 +2257,32 @@
    }
 }
 
-sub swap_out {
+sub save {
    my ($self) = @_;
 
-   # save first because save cedes
-   $self->save;
+   my $lock = cf::lock_acquire "map_data:$self->{path}";
+
+   $self->_save;
+}
+
+sub swap_out {
+   my ($self) = @_;
 
    my $lock = cf::lock_acquire "map_data:$self->{path}";
 
-   return if $self->players;
    return if $self->in_memory != cf::MAP_ACTIVE;
    return if $self->{deny_save};
+   return if $self->players;
 
-   $self->in_memory (cf::MAP_SWAPPED);
-
+   # first deactivate the map and "unlink" it from the core
    $self->deactivate;
    $_->clear_links_to ($self) for values %cf::MAP;
+   $self->in_memory (cf::MAP_SWAPPED);
+
+   # then atomically save
+   $self->_save;
+
+   # then free the map
    $self->clear;
 }
 
@@ -2325,7 +2345,7 @@
 
       $self->unlink_save;
 
-      bless $self, "cf::map";
+      bless $self, "cf::map::wrap";
       delete $self->{deny_reset};
       $self->{deny_save} = 1;
       $self->reset_timeout (1);
@@ -2601,7 +2621,7 @@
    $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
       if $self->map && $self->map->{path} ne "{link}";
 
-   $self->enter_map ($LINK_MAP || link_map, 10, 10);
+   $self->enter_map ($LINK_MAP || link_map, 3, 3);
 }
 
 sub cf::object::player::leave_link {
@@ -3778,12 +3798,11 @@
       _gv_clear *{"$pkg$name"};
 #      use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
    }
-   warn "cleared package $pkg\n";#d#
 }
 
 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;
    }