--- deliantra/server/lib/cf.pm	2006/03/16 21:08:16	1.8
+++ deliantra/server/lib/cf.pm	2006/06/11 15:02:16	1.15
@@ -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};
    }
 }
 
@@ -65,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 {
@@ -173,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;
 }
 
@@ -215,10 +231,24 @@
 };
 
 #############################################################################
+# 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 = shift->{map};
+   my ($map) = @_;
 
    my $path = $map->tmpname;
    defined $path or return;
@@ -228,7 +258,7 @@
 
 *on_mapin =
 *on_mapload = sub {
-   my $map = shift->{map};
+   my ($map) = @_;
 
    my $path = $map->tmpname;
    $path = $map->path unless defined $path;
@@ -245,7 +275,7 @@
 };
 
 *on_mapout = sub {
-   my $map = shift->{map};
+   my ($map) = @_;
 
    my $path = $map->tmpname;
    $path = $map->path unless defined $path;
@@ -275,43 +305,37 @@
 # load/save perl data associated with player->ob objects
 
 *on_player_load = sub {
-   my ($event) = @_;
-   my $path = $event->{message};
-   my $ob = $event->{who};
+   my ($ob, $path) = @_;
 
-   open my $fh, "<:raw", "$path.cfperl"
-      or return; # no perl data
+   if (open my $fh, "<:raw", "$path.cfperl") {
 
-   my $data = Storable::thaw do { local $/; <$fh> };
+      #d##TODO#remove
 
-   $data->{version} <= 1
-      or return; # too new
+      my $data = Storable::thaw do { local $/; <$fh> };
 
-   %$ob = %{$data->{ob}};
-};
+      $data->{version} <= 1
+         or return; # too new
 
-*on_player_save = sub {
-   my ($event) = @_;
-   my $path = $event->{message};
-   my $ob = $event->{who};
+      %$ob = %{$data->{ob}};
+      return;
+   }
 
-   if (keys %$ob) {
-      open my $fh, ">:raw", "$path.cfperl"
-         or die "$path.cfperl: $!";
+   for my $o ($ob, $ob->inv) {
+      if (my $value = $o->get_ob_key_value ("_perl_data")) {
+         $o->set_ob_key_value ("_perl_data");
 
-      stat $path;
+         %$o = %{ Storable::thaw pack "H*", $value };
+      }
+   }
+};
 
-      print $fh Storable::nfreeze {
-         size    => (stat _)[7],
-         time    => (stat _)[9],
-         version => 1,
-         ob      => $ob,
-      };
+*on_player_save = sub {
+   my ($ob, $path) = @_;
 
-      chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
-   } else {
-      unlink "$path.cfperl";
-   }
+   $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
+      for grep %$_, $ob, $ob->inv;
+
+   unlink "$path.cfperl";#d##TODO#remove
 };
 
 register "<global>", __PACKAGE__;