--- deliantra/server/lib/cf.pm	2007/06/16 23:22:59	1.281
+++ deliantra/server/lib/cf.pm	2007/06/24 04:27:20	1.286
@@ -1349,6 +1349,39 @@
    \@paths
 }
 
+=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
+
+Expand crossfire pod fragments into protocol xml.
+
+=cut
+
+sub expand_cfpod {
+   ((my $self), (local $_)) = @_;
+
+   # escape & and <
+   s/&/&amp;/g;
+   s/(?<![BIUGH])</&lt;/g;
+
+   # this is buggy, it needs to properly take care of nested <'s
+
+   1 while
+      # replace B<>, I<>, U<> etc.
+      s/B<([^\>]*)>/<b>$1<\/b>/
+      || s/I<([^\>]*)>/<i>$1<\/i>/
+      || s/U<([^\>]*)>/<u>$1<\/u>/
+      # replace G<male|female> tags
+      || s{G<([^>|]*)\|([^>]*)>}{
+         $self->gender ? $2 : $1
+      }ge
+      # replace H<hint text>
+      || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
+
+   # create single paragraphs (very hackish)
+   s/(?<=\S)\n(?=\w)/ /g;
+
+   $_
+}
+
 =item $player->ext_reply ($msgid, %msg)
 
 Sends an ext reply to the player.
@@ -2047,9 +2080,23 @@
 
    if ($self->{record_replies}) {
       push @{ $self->{record_replies} }, [$npc, $msg, $flags];
+
    } else {
-      $msg = $npc->name . " says: $msg" if $npc;
-      $self->message ($msg, $flags);
+      my $pl = $self->contr;
+
+      if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
+         my $diag = $pl->{npc_dialog};
+         $diag->{pl}->ext_reply (
+            $diag->{id},
+            msgtype => "reply",
+            msg => $diag->{pl}->expand_cfpod ($msg),
+            add_topics => []
+         );
+
+      } else {
+         $msg = $npc->name . " says: $msg" if $npc;
+         $self->message ($msg, $flags);
+      }
    }
 }
 
@@ -2304,6 +2351,44 @@
    $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
 }
 
+=item $client->send_msg ($color, $type, $msg, [extra...])
+
+Send a drawinfo or msg packet to the client, formatting the msg for the
+client if neccessary. C<$type> should be a string identifying the type of
+the message, with C<log> being the default. If C<$color> is negative, suppress
+the message unless the client supports the msg packet.
+
+=cut
+
+sub cf::client::send_msg {
+   my ($self, $color, $type, $msg, @extra) = @_;
+
+   $msg = $self->pl->expand_cfpod ($msg);
+
+   if ($self->can_msg) {
+      $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
+   } else {
+      # replace some tags by gcfclient-compatible ones
+      for ($msg) {
+         1 while
+            s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
+            || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
+            || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
+            || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
+            || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
+      }
+
+      if ($color >= 0) {
+         if (0 && $msg =~ /\[/) {
+            $self->send_packet ("drawextinfo $color 4 0 $msg")
+         } else {
+            $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
+            $self->send_packet ("drawinfo $color $msg")
+         }
+      }
+   }
+}
+
 =item $client->ext_event ($type, %msg)
 
 Sends an exti event to the client.