[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.311 by root, Fri Jul 20 16:11:10 2007 UTC

    utf8::encode $text;
    $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
 }
-=item $client->send_msg ($color, $type, $msg, [extra...])
+=item $client->send_msg ($channel, $msg, $color, [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) = @_;
+   my ($self, $channel, $msg, $color, @extra) = @_;
    $msg = $self->pl->expand_cfpod ($msg);
    return unless @extra || length $msg;
+   $color &= ~cf::NDI_UNIQUE; # just in case...
+   if (ref $channel) {
+      # send meta info to client, if not yet sent
+      unless (exists $self->{channel}{$channel->{id}}) {
+         $self->{channel}{$channel->{id}} = $channel;
+         $self->ext_event (channel_info => %$channel);
+      }
+      $channel = $channel->{id};
+   }
    if ($self->can_msg) {
-      $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
+      $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
    } else {
       # replace some tags by gcfclient-compatible ones
       for ($msg) {
          1 while
             s/<b>([^<]*)<\/b>/[b]${1}[\/b]/

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