--- deliantra/server/ext/cfplus.ext	2007/11/14 08:10:12	1.11
+++ deliantra/server/ext/cfplus.ext	2008/07/14 23:57:45	1.12
@@ -64,7 +64,7 @@
    if ($pl->cell_visible ($dx, $dy)) {
       for my $ob ($pl->ob->map->at ($pl->ob->x + $dx, $pl->ob->y + $dy)) {
          $res{npc_dialog} = [$ob->name, $dx, $dy]
-            if $near && NPC_Dialogue::has_dialogue $ob && !$pl->{npc_dialog};
+            if $near && $ob->has_dialogue && !$pl->{npc_dialog};
       }
    }
 
@@ -98,7 +98,7 @@
    return (error => "only one dialog can be open at a time") if $pl->{npc_dialog}; # only one dialog at a time
 
    for my $npc ($pl->ob->map->at ($pl->ob->x + $dx, $pl->ob->y + $dy)) {
-      if (NPC_Dialogue::has_dialogue $npc) {
+      if ($npc->has_dialogue) {
          $pl->attach ("npc_dialog_active");
          $pl->{npc_dialog} = new NPC_Dialogue pl => $pl, npc => $npc, id => $id;
          dialog_tell $id, $pl->{npc_dialog}, "hi";