[ViewVC] Diff of: cvs/deliantra/server/ext/cfplus.ext

Comparing deliantra/server/ext/cfplus.ext (file contents):
Revision 1.13 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.15 by root, Mon Oct 26 02:34:37 2009 UTC

 cf::register_extcmd npc_dialog_begin => sub {
    my ($pl, $id, $token) = @_;
    #TODO:
-   # this is not a request, so returnign does no good: make it a request and die on error
+   # this is not a request, so returning does no good: make it a request and die on error
    return unless $pl->ob && $pl->ob->map;
    my ($name, $dx, $dy) = @$token;
       my ($pl) = @_;
       delete $pl->{npc_dialog};
       $pl->detach ("npc_dialog_active");
    },
+   on_map_change => sub {
+      my ($pl) = @_;
+      my $dialog = delete $pl->{npc_dialog}
+         or return;
+      $pl->ext_msg ($dialog->{id} => error => "out of range");
+      $pl->detach ("npc_dialog_active");
+   },
    on_move => sub {
       my ($pl, $dir) = @_;
       # must delay a bit :/
       my $delay; $delay = EV::timer 0, 0, sub {
          if (my $dialog = $pl->{npc_dialog}) {
             my (undef, $dx, $dy) = $pl->ob->rangevector ($dialog->{npc});
             return if (abs $dx) <= 2 && (abs $dy) <= 2;
+            delete $pl->{npc_dialog};
             $pl->ext_msg ($dialog->{id} => error => "out of range");
+            $pl->detach ("npc_dialog_active");
          }
-         delete $pl->{npc_dialog};
-         $pl->detach ("npc_dialog_active");
       };
    },
 ;
 cf::player->attach (

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines