--- deliantra/server/lib/cf.pm	2006/02/03 19:49:32	1.1
+++ deliantra/server/lib/cf.pm	2006/03/28 16:48:11	1.12
@@ -2,6 +2,7 @@
 
 use Symbol;
 use List::Util;
+use Storable;
 
 use strict;
 
@@ -23,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) = @_;
@@ -42,7 +45,7 @@
 
       *{"$class\::set_$sub"} = sub {
          $_[0]->set_property ($type, $idx, $_[1]);
-      };
+      } unless $ignore_set{$prop};
    }
 }
 
@@ -60,6 +63,7 @@
 @cf::object::player::ISA = 'cf::object';
 @cf::object::map::ISA    = 'cf::object';
 
+my %ext_pkg;
 my @exts;
 my @hook;
 my %command;
@@ -67,12 +71,19 @@
 sub inject_event {
    my ($data) = @_;
 
-   my $cb = $hook[$data->{event_code}]
+   my $cb = $hook[$data->{event_code}]{$data->{extension}}
       or return;
 
-   $_->($data) for values %$cb;
+   $cb->($data)
+}
 
-   ()
+sub inject_global_event {
+   my $event = shift;
+
+   my $cb = $hook[$event]
+      or return;
+
+   List::Util::max map &$_, values %$cb
 }
 
 sub inject_command {
@@ -90,14 +101,28 @@
 
    my $caller = caller;
 
+   warn "registering command '$name/$time' to '$caller'";
+
    push @{ $command{$name} }, [$time, $cb, $caller];
    $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
 }
 
+sub register {
+   my ($base, $pkg) = @_;
+
+   for my $idx (0 .. $#EVENT) {
+      if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
+         warn "registering $EVENT[$idx] hook to '$pkg'\n";
+         $hook[$idx]{$base} = $ref;
+      }
+   }
+}
+
 sub load_extension {
    my ($path) = @_;
 
    $path =~ /([^\/\\]+)\.ext$/ or die "$path";
+   my $base = $1;
    my $pkg = $1;
    $pkg =~ s/[^[:word:]]/_/g;
    $pkg = "cf::ext::$pkg";
@@ -117,17 +142,12 @@
       or die "$path: $@";
 
    push @exts, $pkg;
+   $ext_pkg{$base} = $pkg;
 
-   no strict 'refs';
-
+#   no strict 'refs';
 #   @{"$pkg\::ISA"} = cf::ext::;
 
-   for my $idx (0 .. $#EVENT) {
-      if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
-         warn "registering $EVENT[$idx] hook\n";
-         $hook[$idx]{$pkg} = $ref;
-      }
-   }
+   register $base, $pkg;
 }
 
 sub unload_extension {
@@ -160,7 +180,11 @@
    my $LIBDIR = maps_directory "perl";
 
    for my $ext (<$LIBDIR/*.ext>) {
-      load_extension $ext;
+      next unless -r $ext;
+      eval {
+         load_extension $ext;
+         1
+      } or warn "$ext not loaded: $@";
    }
 }
 
@@ -168,14 +192,128 @@
    my ($who, $arg) = @_;
 
    if ($who->flag (FLAG_WIZ)) {
+      $who->message ("reloading...");
+
       warn "reloading...\n";
-      unload_extension $_ for @exts;
-      @exts = 0;
-      load_extensions;
+      eval {
+         unload_extension $_ for @exts;
+         delete $INC{"cf.pm"};
+
+         # don't, removes xs symbols, too
+         #Symbol::delete_package $pkg;
+
+         require cf;
+      };
+      warn $@ if $@;
+      $who->message ($@) if $@;
       warn "reloaded\n";
+
+      $who->message ("reloaded");
+   } else {
+      $who->message ("Intruder Alert!");
    }
 };
 
+#############################################################################
+# load/save/clean perl data associated with a map
+
+*on_mapclean = sub {
+   my $map = shift->{map};
+
+   my $path = $map->tmpname;
+   defined $path or return;
+
+   unlink "$path.cfperl";
+};
+
+*on_mapin =
+*on_mapload = sub {
+   my $map = shift->{map};
+
+   my $path = $map->tmpname;
+   $path = $map->path unless defined $path;
+
+   open my $fh, "<:raw", "$path.cfperl"
+      or return; # no perl data
+
+   my $data = Storable::thaw do { local $/; <$fh> };
+
+   $data->{version} <= 1
+      or return; # too new
+
+   $map->_set_obs ($data->{obs});
+};
+
+*on_mapout = sub {
+   my $map = shift->{map};
+
+   my $path = $map->tmpname;
+   $path = $map->path unless defined $path;
+
+   my $obs = $map->_get_obs;
+
+   if (defined $obs) {
+      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,
+      };
+
+      chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
+   } else {
+      unlink "$path.cfperl";
+   }
+};
+
+#############################################################################
+# 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;
 
 1