--- deliantra/server/lib/cf.pm	2010/03/20 02:24:38	1.507
+++ deliantra/server/lib/cf.pm	2010/04/07 18:35:56	1.511
@@ -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}
@@ -1535,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) = @_;
 
@@ -1550,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;
 }
@@ -1771,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},
@@ -3136,7 +3152,7 @@
 }
 
 cf::client->attach (
-   on_destroy => sub {
+   on_client_destroy => sub {
       my ($ns) = @_;
 
       $_->cancel for values %{ (delete $ns->{_coro}) || {} };
@@ -3543,7 +3559,6 @@
 
       cf::init_uuid;
       cf::init_signals;
-      cf::init_commands;
       cf::init_skills;
 
       cf::init_beforeplay;