--- deliantra/server/lib/cf.pm	2010/01/30 23:50:16	1.504
+++ deliantra/server/lib/cf.pm	2010/04/11 04:52:07	1.512
@@ -505,7 +505,7 @@
    my ($job) = @_;
 
    if ($Coro::current == $Coro::main) {
-      my $time = EV::time;
+      my $time = AE::time;
 
       # this is the main coro, too bad, we have to block
       # till the operation succeeds, freezing the server :/
@@ -532,7 +532,7 @@
          }
       }
 
-      my $time = EV::time - $time;
+      my $time = AE::time - $time;
 
       $TICK_START += $time; # do not account sync jobs to server load
 
@@ -1312,7 +1312,7 @@
 use File::Glob ();
 
 cf::player->attach (
-   on_command => sub {
+   on_unknown_command => sub {
       my ($pl, $name, $params) = @_;
 
       my $cb = $COMMAND{$name}
@@ -1401,38 +1401,47 @@
          $todo{$base} = \%ext;
       }
 
+      my $pass = 0;
       my %done;
       while (%todo) {
          my $progress;
 
+         ++$pass;
+
+         ext:
          while (my ($k, $v) = each %todo) {
             for (split /,\s*/, $v->{meta}{depends}) {
-               goto skip
+               next ext
                   unless exists $done{$_};
             }
 
-            warn "... loading '$k' into '$v->{pkg}'\n";
+            warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
 
-            unless (eval $v->{source}) {
-               my $msg = $@ ? "$v->{path}: $@\n"
-                            : "$v->{base}: extension inactive.\n";
-
-               if (exists $v->{meta}{mandatory}) {
-                  warn $msg;
-                  cf::cleanup "mandatory extension failed to load, exiting.";
-               }
-               
-               warn $msg;
-            }
+            my $active = eval $v->{source};
 
-            $done{$k} = delete $todo{$k};
-            push @EXTS, $v->{pkg};
-            $progress = 1;
+            if (length $@) {
+               warn "$v->{path}: $@\n";
+
+               cf::cleanup "mandatory extension '$k' failed to load, exiting."
+                  if exists $v->{meta}{mandatory};
+            } else {
+               $done{$k} = delete $todo{$k};
+               push @EXTS, $v->{pkg};
+               $progress = 1;
+
+               warn "$v->{base}: extension inactive.\n"
+                  unless $active;
+            }
          }
 
-         skip:
-         die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
-            unless $progress;
+         unless ($progress) {
+            warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
+
+            while (my ($k, $v) = each %todo) {
+               cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
+                  if exists $v->{meta}{mandatory};
+            }
+         }
       }
    };
 }
@@ -1526,6 +1535,19 @@
    }
 }
 
+cf::player->attach (
+   on_load => sub {
+      my ($pl, $path) = @_;
+
+      # restore slots saved in save, below
+      my $slots = delete $pl->{_slots};
+
+      $pl->ob->current_weapon ($slots->[0]);
+      $pl->combat_ob          ($slots->[1]);
+      $pl->ranged_ob          ($slots->[2]);
+   },
+);
+
 sub save($) {
    my ($pl) = @_;
 
@@ -1541,6 +1563,9 @@
 
    cf::get_slot 0.01;
 
+   # save slots, to be restored later
+   local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
+
    $pl->save_pl ($path);
    cf::cede_to_tick;
 }
@@ -1762,7 +1787,7 @@
    # mit "rum" bekleckern, nicht
    $self->_create_random_map (
       $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
-      $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
+      $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
       $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
       $rmp->{exit_on_final_map},
       $rmp->{xsize}, $rmp->{ysize},
@@ -2086,6 +2111,9 @@
    $self->post_load;
 }
 
+# customize the map for a given player, i.e.
+# return the _real_ map. used by e.g. per-player
+# maps to change the path to ~playername/mappath
 sub customise_for {
    my ($self, $ob) = @_;
 
@@ -3124,7 +3152,7 @@
 }
 
 cf::client->attach (
-   on_destroy => sub {
+   on_client_destroy => sub {
       my ($ns) = @_;
 
       $_->cancel for values %{ (delete $ns->{_coro}) || {} };
@@ -3531,7 +3559,6 @@
 
       cf::init_uuid;
       cf::init_signals;
-      cf::init_commands;
       cf::init_skills;
 
       cf::init_beforeplay;
@@ -3559,13 +3586,15 @@
 BEGIN {
    our %SIGWATCHER = ();
    for my $signal (qw(INT HUP TERM)) {
-      $SIGWATCHER{$signal} = EV::signal $signal, sub {
+      $SIGWATCHER{$signal} = AE::signal $signal, sub {
          cf::cleanup "SIG$signal";
       };
    }
 }
 
 sub write_runtime_sync {
+   my $t0 = AE::time;
+
    # first touch the runtime file to show we are still running:
    # the fsync below can take a very very long time.
 
@@ -3573,7 +3602,7 @@
 
    my $guard = cf::lock_acquire "write_runtime";
 
-   my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
+   my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
       or return;
 
    my $value = $cf::RUNTIME + 90 + 10;
@@ -3596,7 +3625,7 @@
    aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
       and return;
 
-   warn "runtime file written.\n";
+   warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
 
    1
 }
@@ -3744,7 +3773,7 @@
 
    return if $RELOAD++;
 
-   my $t1 = EV::time;
+   my $t1 = AE::time;
 
    while ($RELOAD) {
       warn "reloading...";
@@ -3857,7 +3886,7 @@
       --$RELOAD;
    }
 
-   $t1 = EV::time - $t1;
+   $t1 = AE::time - $t1;
    warn "reload completed in ${t1}s\n";
 };
 
@@ -3870,7 +3899,7 @@
    $RELOAD_WATCHER ||= cf::async {
       Coro::AIO::aio_wait cache_extensions;
 
-      $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
+      $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
          do_reload_perl;
          undef $RELOAD_WATCHER;
       };
@@ -3921,7 +3950,7 @@
 
    cf::server_tick; # one server iteration
 
-   #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
+   #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
 
    if ($NOW >= $NEXT_RUNTIME_WRITE) {
       $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;