--- deliantra/server/lib/cf.pm	2006/02/08 03:46:15	1.5
+++ deliantra/server/lib/cf.pm	2006/06/11 15:02:16	1.15
@@ -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};
    }
 }
 
@@ -64,25 +67,25 @@
 my @exts;
 my @hook;
 my %command;
+my %extcmd;
 
 sub inject_event {
-   my ($data) = @_;
+   my $extension = shift;
+   my $event_code = shift;
 
-   my $cb = $hook[$data->{event_code}]{$data->{extension}}
+   my $cb = $hook[$event_code]{$extension}
       or return;
 
-   $cb->($data)
+   &$cb
 }
 
 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 {
@@ -106,6 +109,17 @@
    $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) = @_;
 
@@ -132,16 +146,10 @@
    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]{$base} = $ref;
-      }
-   }
+   register $base, $pkg;
 }
 
 sub unload_extension {
@@ -167,6 +175,20 @@
       }
    }
 
+   # remove extcmds
+   for my $name (keys %command) {
+      my @cb = grep $_->[2] ne $pkg, @{ $command{$name} };
+
+      if (@cb) {
+         $command{$name} = \@cb;
+         $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
+      } else {
+         delete $command{$name};
+         delete $COMMAND{"$name\000"};
+      }
+   }
+
+
    Symbol::delete_package $pkg;
 }
 
@@ -208,6 +230,116 @@
    }
 };
 
+#############################################################################
+# extcmd framework, basically convert ext <id> <pkg> arg1 args
+# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
+
+sub on_extcmd {
+   my ($pl, $buf) = @_;
+
+   my ($id, $pkg, $name, $data) = split / /, $buf, 4;
+
+   if (my $method = "cf::ext::$pkg"->can ("on_extcmd_$name")) {
+      $method->($pl, $id, $buf);
+   }
+}
+
+#############################################################################
+# load/save/clean perl data associated with a map
+
+*on_mapclean = sub {
+   my ($map) = @_;
+
+   my $path = $map->tmpname;
+   defined $path or return;
+
+   unlink "$path.cfperl";
+};
+
+*on_mapin =
+*on_mapload = sub {
+   my ($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) = @_;
+
+   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 ($ob, $path) = @_;
+
+   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 ($ob, $path) = @_;
+
+   $_->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