--- deliantra/server/lib/cf.pm	2006/03/07 13:44:43	1.7
+++ deliantra/server/lib/cf.pm	2006/03/28 16:48:11	1.12
@@ -24,6 +24,8 @@
    };
 }
 
+my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply!
+
 # generate property mutators
 sub prop_gen {
    my ($prefix, $class) = @_;
@@ -43,7 +45,7 @@
 
       *{"$class\::set_$sub"} = sub {
          $_[0]->set_property ($type, $idx, $_[1]);
-      };
+      } unless $ignore_set{$prop};
    }
 }
 
@@ -76,14 +78,12 @@
 }
 
 sub inject_global_event {
-   my ($data) = @_;
+   my $event = shift;
 
-   my $cb = $hook[$data->{event_code}]
+   my $cb = $hook[$event]
       or return;
 
-   $_->($data) for values %$cb;
-
-   ()
+   List::Util::max map &$_, values %$cb
 }
 
 sub inject_command {
@@ -214,6 +214,9 @@
    }
 };
 
+#############################################################################
+# load/save/clean perl data associated with a map
+
 *on_mapclean = sub {
    my $map = shift->{map};
 
@@ -253,9 +256,13 @@
       open my $fh, ">:raw", "$path.cfperl"
          or die "$path.cfperl: $!";
 
+      stat $path;
+
       print $fh Storable::nfreeze {
+         size    => (stat _)[7],
+         time    => (stat _)[9],
          version => 1,
-         obs => $obs,
+         obs     => $obs,
       };
 
       chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
@@ -264,6 +271,47 @@
    }
 };
 
+#############################################################################
+# load/save perl data associated with player->ob objects
+
+*on_player_load = sub {
+   my ($event) = @_;
+   my $path = $event->{message};
+   my $ob = $event->{who};
+
+   if (open my $fh, "<:raw", "$path.cfperl") {
+
+      #d##TODO#remove
+
+      my $data = Storable::thaw do { local $/; <$fh> };
+
+      $data->{version} <= 1
+         or return; # too new
+
+      %$ob = %{$data->{ob}};
+      return;
+   }
+
+   for my $o ($ob, $ob->inv) {
+      if (my $value = $o->get_ob_key_value ("_perl_data")) {
+         $o->set_ob_key_value ("_perl_data");
+
+         %$o = %{ Storable::thaw pack "H*", $value };
+      }
+   }
+};
+
+*on_player_save = sub {
+   my ($event) = @_;
+   my $path = $event->{message};
+   my $ob = $event->{who};
+
+   $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
+      for grep %$_, $ob, $ob->inv;
+
+   unlink "$path.cfperl";#d##TODO#remove
+};
+
 register "<global>", __PACKAGE__;
 
 load_extensions;