--- deliantra/server/lib/cf.pm	2006/06/11 15:02:16	1.15
+++ deliantra/server/lib/cf.pm	2006/07/19 08:50:42	1.22
@@ -4,6 +4,9 @@
 use List::Util;
 use Storable;
 
+use Event;
+$Event::Eval = 1; # no idea why this is required, but it is
+
 use strict;
 
 our %COMMAND;
@@ -63,6 +66,10 @@
 @cf::object::player::ISA = 'cf::object';
 @cf::object::map::ISA    = 'cf::object';
 
+$Event::DIED = sub {
+   warn "error in event callback: @_";
+};
+
 my %ext_pkg;
 my @exts;
 my @hook;
@@ -102,19 +109,27 @@
    my ($name, $time, $cb) = @_;
 
    my $caller = caller;
-
-   warn "registering command '$name/$time' to '$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_extcmd {
+   my ($name, $cb) = @_;
+
+   my $caller = caller;
+   #warn "registering extcmd '$name' to '$caller'";
+
+   $extcmd{$name} = [$cb, $caller];
+}
+
 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";
+         #warn "registering $EVENT[$idx] hook to '$pkg'\n";
          $hook[$idx]{$base} = $ref;
       }
    }
@@ -157,6 +172,10 @@
 
    warn "removing extension $pkg\n";
 
+   if (my $cb = $pkg->can ("on_unload")) {
+      $cb->($pkg);
+   }
+
    # remove hooks
    for my $idx (0 .. $#EVENT) {
       delete $hook[$idx]{$pkg};
@@ -176,19 +195,10 @@
    }
 
    # 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"};
-      }
+   for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
+      delete $extcmd{$name};
    }
 
-
    Symbol::delete_package $pkg;
 }
 
@@ -212,11 +222,13 @@
 
       warn "reloading...\n";
       eval {
+         $_->cancel for Event::all_watchers;
+
          unload_extension $_ for @exts;
          delete $INC{"cf.pm"};
 
          # don't, removes xs symbols, too
-         #Symbol::delete_package $pkg;
+         #Symbol::delete_package __PACKAGE__;
 
          require cf;
       };
@@ -237,11 +249,10 @@
 sub on_extcmd {
    my ($pl, $buf) = @_;
 
-   my ($id, $pkg, $name, $data) = split / /, $buf, 4;
+   my ($type) = $buf =~ s/^(\S+) // ? $1 : "";
 
-   if (my $method = "cf::ext::$pkg"->can ("on_extcmd_$name")) {
-      $method->($pl, $id, $buf);
-   }
+   $extcmd{$type}[0]->($pl, $buf)
+      if $extcmd{$type};
 }
 
 #############################################################################
@@ -338,8 +349,26 @@
    unlink "$path.cfperl";#d##TODO#remove
 };
 
+#############################################################################
+# core extensions - in perl
+
+# rough implementation of a future "reply" method that works
+# with dialog boxes.
+sub cf::object::player::reply($$;$) {
+   my ($self, $msg, $flags) = @_;
+
+   $flags = cf::NDI_WHITE unless @_ >= 3;
+
+   $self->message ($msg, $flags);
+}
+
+#############################################################################
+# initialisation
+
 register "<global>", __PACKAGE__;
 
+unshift @INC, maps_directory "perl";
+
 load_extensions;
 
 1