--- deliantra/server/ext/cfplus.ext	2007/06/16 14:35:41	1.5
+++ deliantra/server/ext/cfplus.ext	2007/06/19 18:14:36	1.7
@@ -35,7 +35,9 @@
 
    my $pl = $dialog->{pl};
    my ($reply, @kw) = $dialog->tell ($msg);
-   $reply = "..." unless $reply;
+
+   $reply = "..." unless defined $reply;
+   return if $reply eq ""; # NPC doesn't want to say, or wants to say something later
 
    $pl->ext_reply ($id => msgtype => "reply", msg => $reply, add_topics => \@kw);
 }
@@ -96,7 +98,7 @@
    for my $npc ($pl->ob->map->at ($pl->ob->x + $dx, $pl->ob->y + $dy)) {
       if (NPC_Dialogue::has_dialogue $npc) {
          $pl->attach ("npc_dialog_active");
-         $pl->{npc_dialog} = new NPC_Dialogue pl => $pl, npc => $npc;
+         $pl->{npc_dialog} = new NPC_Dialogue pl => $pl, npc => $npc, id => $id;
          dialog_tell $id, $pl->{npc_dialog}, "hi";
          return;
       }